From 89bca237c7002371a005528b8fea11cba15407b2 Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Thu, 22 Sep 2011 14:47:56 +0800
Subject: [PATCH] 	modified:   di_dialog.py 	modified:   di_main.py

---
 dialog/di_dialog.py | 4 +---
 dialog/di_main.py   | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dialog/di_dialog.py b/dialog/di_dialog.py
index 28939fc..531d087 100644
--- a/dialog/di_dialog.py
+++ b/dialog/di_dialog.py
@@ -32,8 +32,6 @@ class Welcome(Dialog):
 
     def set_data(self):
         s=Dialog.dialog.yesno(self.text,self.height,self.width,title='welcome',clear=1)
-        if s == 0 :
-            ri_data.init()
         return s
 		  
 class SerialNumber(Dialog):
@@ -164,7 +162,7 @@ class Raid(Dialog):
 
             from_os_list= [ R.from_os for R in ri_data.Raid.dict.values() if R.from_os == 'no' ]
 
-            if len(fd_devices) < 3 and  not from_os_list :
+            if len(fd_devices) < 2 and  not from_os_list :
                 return 0 
 
             if not fd_devices :
diff --git a/dialog/di_main.py b/dialog/di_main.py
index 7c20a36..560be1c 100644
--- a/dialog/di_main.py
+++ b/dialog/di_main.py
@@ -13,10 +13,10 @@ di_dialog.Group(30,70)
 di_dialog.Service(25,50)
 di_dialog.Prepar_installation(40,100)
 
-
 list=['welcome','raid','mountpoint','serialnumber','network','group','service','information']
 
-if len(di_dialog.Raid.raid_raw_init()) < 3:
+ri_data.init()
+if len(di_dialog.Raid.raid_raw_init()) < 2:
     del list[1]
 
 count=0