modified: interface/ri_data.py

modified:   interface/ri_func_dep.py
	modified:   interface/ri_inst_cli.py
	modified:   interface/ri_inst_tk.py
	modified:   interface/ri_oper.py
	modified:   xml/interface.xml
  make tab equal 4 spaces

interface/ri_data.py

@@ -296,7 +296,7 @@ p_node - xml node (parent node) '''
             raids.appendChild(rd)
 
         p_node.appendChild(raids)
-		#ri_tk_cmd.py use
+    #ri_tk_cmd.py use
     @staticmethod
     def get_size(dev):
         ''' calculate raid device size '''
@@ -341,7 +341,7 @@ class MountPoint:
         mp.directory  = dir
         mp.filesystem = fs
         mp.format     = fm
-							
+
     @staticmethod
     def init_from_internal():
         ''' init MountPoint from internal class Partition and class Raid '''

interface/ri_func_dep.py

@@ -3,91 +3,89 @@
 import ri_data
 
 class Pkg():
-	list = []
+    list = []
 
-	@staticmethod
-	def set_list ():
-		list = ri_data.Group.get_install_pkgs()
+    @staticmethod
+    def set_list ():
+        list = ri_data.Group.get_install_pkgs()
 
 class FsType():
-	list = []
+    list = []
 
-	@staticmethod
-	def set_list ():
-		for fs in ri_data.MountPoint.dict.values():
-			FsType.list.append(fs.filesystem)
+    @staticmethod
+    def set_list ():
+        for fs in ri_data.MountPoint.dict.values():
+            FsType.list.append(fs.filesystem)
 
 class FunctionDepending():
-	list = []
-	def __init__(self, pkg):
-		self.package = pkg
-		FunctionDepending.list.append(self)
-	
-	def check(self):
-		return False
+    list = []
+    def __init__(self, pkg):
+        self.package = pkg
+        FunctionDepending.list.append(self)
 
-	def error(self):
-		return {}
+    def check(self):
+        return False
 
+    def error(self):
+        return {}
 
 class FileSystem(FunctionDepending):
-	list = []
-	def __init__(self, fs_type, fs_pkg):
-		self.filesystem_type = fs_type
-		FunctionDepending.__init__(self, fs_pkg)
+    list = []
+    def __init__(self, fs_type, fs_pkg):
+        self.filesystem_type = fs_type
+        FunctionDepending.__init__(self, fs_pkg)
 
-	def check(self):
-		if self.filesystem_type in FsType.list and self.package not in Pkg.list:
-			return False
-		return True
-	
-	def error(self):
-		mesg="format filesystem " + self.filesystem_type
-		return {mesg:self.package}
+    def check(self):
+        if self.filesystem_type in FsType.list and self.package not in Pkg.list:
+            return False
+        return True
+
+def error(self):
+    mesg="format filesystem " + self.filesystem_type
+    return {mesg:self.package}
 
 class DHCP(FunctionDepending):
-	def __init__(self):
-		FunctionDepending.__init__(self, 'dhcpcd')
+    def __init__(self):
+        FunctionDepending.__init__(self, 'dhcpcd')
 
-	def check(self):
-		if ri_data.Network.configuration == 'dynamic' and 'dhcpcd' not in Pkg.list:
-			return False
-		return True
+    def check(self):
+        if ri_data.Network.configuration == 'dynamic' and 'dhcpcd' not in Pkg.list:
+            return False
+        return True
 
-	def error(self):
-		return {"dynamic configure network":"dhcpcd"}
+    def error(self):
+        return {"dynamic configure network":"dhcpcd"}
 
 class RAID(FunctionDepending):
-	def __init__(self):
-		FunctionDepending.__init__(self, 'mdadm')
-			
-	def check(self):
-		if 'mdadm' not in Pkg.list:
-			for i in ri_data.Raid.dict.values():
-				if i.from_os == 'no':
-					return False
-		return True
+    def __init__(self):
+        FunctionDepending.__init__(self, 'mdadm')
+            
+    def check(self):
+        if 'mdadm' not in Pkg.list:
+            for i in ri_data.Raid.dict.values():
+                if i.from_os == 'no':
+                    return False
+        return True
 
-	def error(self):
-		return {"make raid":"mdadm"}
+    def error(self):
+        return {"make raid":"mdadm"}
 
 def check_function_depending():
+    Pkg.set_list()
+    FsType.set_list()
+    func_dep_dict = {}
 
-	Pkg.set_list()
-	FsType.set_list()
-	func_dep_dict = {}
+    FileSystem("xfs", "xfsprogs")
+    FileSystem("jfs", "jfsutils")
 
-	FileSystem("xfs", "xfsprogs")
-	FileSystem("jfs", "jfsutils")
+    DHCP()
+    RAID()
 
-	DHCP()
-	RAID()
-
-	for i in FunctionDepending.list:
-		# if function depending package not in package list
-		if not i.check():
-			tmp = i.error()
-			func_dep_dict.update(tmp)
-	return func_dep_dict
+    for i in FunctionDepending.list:
+        # if function depending package not in package list
+        if not i.check():
+            tmp = i.error()
+            func_dep_dict.update(tmp)
+    return func_dep_dict
 
 

interface/ri_inst_cli.py

@@ -27,17 +27,16 @@ def set_task_scale():
     print "%.2f" %float(Rate.value)
 
 def set_task_over():
-		string = raw_input("Rocky system installation successfully, are your restart?[Y]")
-		if string.lower() == "y":
-				return True
-		return False
+    string = raw_input("Rocky system installation successfully, are your restart?[Y]")
+    if string.lower() == "y":
+        return True
+    return False
 
 def root_destroy(): 
-		pass
+    pass
 
 def error(oper, ret):
-        print "%s:\n Error number: %d\n %s"%(oper.english_name, ret, oper.return_value[ret][0])
-
+    print "%s:\n Error number: %d\n %s"%(oper.english_name, ret, oper.return_value[ret][0])
 
 def start(func):
     func()

interface/ri_inst_tk.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #coding: utf-8
-#				DESCRIPTION:    display module for install  (tk)
+#       DESCRIPTION:    display module for install  (tk)
 #
 #       SCRIPT NAME:    ri_inst_tk.py
 #
@@ -63,8 +63,8 @@ stringvar_bar=StringVar()
 
 #label
 lab_task=Label(root,text='%s:'%(language=="chinese" and u"任务" or "Task"))
-lab_progress_bar=Label(root,text='%s:'%(language=="chinese" and u"进度" \
-		or 'Progress bar'))
+lab_progress_bar=Label(root,text='%s:'%(language=="chinese" and u"进度"\
+        or 'Progress bar'))
 lab_operation=Label(root,text="")
 lab_linx=Label(root,text="Linx")
 
@@ -79,7 +79,7 @@ lab_linx.grid        (row=4, column=1)
 
 #logo
 photo_bm = PhotoImage(file="%s/../data/linxlogo.gif"\
-		%os.path.split(os.path.realpath(__file__))[0])
+        %os.path.split(os.path.realpath(__file__))[0])
 logo_label=Label(root,image=photo_bm)
 logo_label.grid(row=0,column=0,padx=50, pady=50, sticky='NW')
 

interface/ri_oper.py

@@ -160,7 +160,7 @@ class Mount(Operation):
     # dict saved only device and mount point
     dict={}
     def __init__(self,scr):
-        Operation.__init__(self, 'Mount partition', u'挂载分区', 'mount_partition.sh',scr)	
+        Operation.__init__(self,'Mount partition', u'挂载分区', 'mount_partition.sh',scr)
 
     def get_stdin(self):
         mount=''
@@ -215,12 +215,12 @@ class GenerateIssue(Operation):
     def __init__(self,scr):
         Operation.__init__(self,'Generate /etc/issue',u'生成/etc/issue文件','generate_issue.sh',scr)
 
-    def get_arguments(self):	
+    def get_arguments(self):
         args=[]
         # FIXME if tag file format is error?
         if os.path.isfile("/tag"):
-            fd=open("/tag","r")	
-            string = fd.read()	
+            fd=open("/tag","r")
+            string = fd.read()
             list = string.split('\n')[0].split('-')
             args = ['-v']+[list[0][5:]]+["-a"]+[list[1]]+["-r"]+[list[2]]+['-d']+['-'.join(list[3:])]
         fd.close()
@@ -256,11 +256,11 @@ class ConfigureNetwork(Operation):
                 network+="-s %s "%data.secondary_dns
         else:
             network+="-t dynamic "
-            if data.hostname is not '':	
+            if data.hostname:
                 network+="-h %s "%data.hostname
         return [network]
 
-class MakeServiceAutoBoot(Operation):	
+class MakeServiceAutoBoot(Operation):
     """class for make service autoboot"""
     def __init__(self,scr):
         Operation.__init__(self,"Make service autoboot",u"启动服务器","mk_serv_autoboot.sh",scr)
@@ -319,7 +319,7 @@ class ConfigureBootloader(Operation):
             string = fd.read()
             list = string.split('-')
             fd.close()
-         
+
         bootloader=['-t',tp,'-o',list[0][5:].split('.')[0]+'.'+list[0][5:].split('.')[1],'-k','vga=791 linx_serial=%s' %ri_data.SerialNumber.value.strip()]
 
         for k in Mount.dict.keys():

xml/interface.xml

@@ -28,10 +28,12 @@ row 4 | quit	    	      			 previous  next    |
       <widget_attribute image='linxlogo.gif'/>
       <grid_location row='0' column='0' sticky='W' padx='5' pady='5'/>
     </widget>
+
     <widget type='Label'>
       <widget_attribute textvariable='main.step_name'/>
       <grid_location row='0' column='1' />
     </widget>
+
     <widget type='Label'>
       <widget_attribute text='#os-name'/>
       <grid_location row='0' column='2' sticky='E'/>
@@ -42,7 +44,7 @@ row 4 | quit	    	      			 previous  next    |
       <grid_location row='1' column='0' columnspan='3' sticky='WE'/>
     </widget>
 
-	<widget type='Text' name='main.help'>
+    <widget type='Text' name='main.help'>
       <widget_attribute width='30' state='disable'/>
       <grid_location row='2' column='0' padx='10' pady='10' sticky='NSWE'/>
     </widget>
@@ -56,15 +58,16 @@ row 4 | quit	    	      			 previous  next    |
       <widget_attribute text='quit' command='quit'/>
       <grid_location row='4' column='0'/>
     </widget>
+
     <widget type='Button'>
       <widget_attribute	text='previous' command='previous'/>
       <grid_location row='4' column='1'/>
     </widget>
+
     <widget type='Button'>
       <widget_attribute text='next' command='next'/>
       <grid_location row='4' column='2' pady='20'/>
     </widget>
-
   </widget>
 
 <!--
@@ -108,17 +111,18 @@ row 4 |                                                            |
     <widget type='Frame'>
       <grid_location row='0' column='0'/>
       <widget type='Label'>
-	<widget_attribute text='serial number'/>
-	<grid_location row='0' column='0' sticky='W'/>
-      </widget>
-      <widget type='Entry'>
-	<widget_attribute width='12' textvariable='serial_no.number'/>
-	<grid_location row='1' column='0' sticky='W'/>
-	<variable name='serial_no.number' type='StringVar' value='123456789012'/>
-	<action init='serial_no_init' quit='serial_no_quit'/>
-      </widget>
+	    <widget_attribute text='serial number'/>
+	    <grid_location row='0' column='0' sticky='W'/>
+    </widget>
+
+    <widget type='Entry'>
+	    <widget_attribute width='12' textvariable='serial_no.number'/>
+	    <grid_location row='1' column='0' sticky='W'/>
+	    <variable name='serial_no.number' type='StringVar' value='123456789012'/>
+	    <action init='serial_no_init' quit='serial_no_quit'/>
     </widget>
   </widget>
+</widget>
 
 <!--
         column 0            column 1            column 2
@@ -155,59 +159,62 @@ row 4 |                                                            |
       <configure row='1' weight='1'/>
       <configure column='0' weight='1'/>
     </grid_management>
+
     <grid_location row='2' column='1' columnspan='2' sticky='NSWE'/>
 
     <widget type='Frame'>
       <grid_location row='0' column='0' sticky='WS' pady='10'/>
       <widget type='Label'>
-	<widget_attribute text='device'/>
-	<grid_location row='0' column='0' />
-      </widget>
-      <widget type='Listbox'>
-	<widget_attribute width='20' height='10'/>
-	<grid_location row='0' column='1' padx='10'/>
-      </widget>
+	    <widget_attribute text='device'/>
+	    <grid_location row='0' column='0' />
     </widget>
-	
-    <widget type='Frame'>
-      <grid_management rows='2' columns='5'>
-	<configure column='3' weight='1'/>
-      </grid_management>
-      <grid_location row='1' column='0' sticky='NW'/>
-      <action>
-	<scroll scrolling='partition.scroll' scrolled='partition.list'/>
-      </action>
-      <widget type='Listbox' name='partition.list'>
-	<widget_attribute width='60'/>
-	<grid_location row='0' column='0' columnspan='4' sticky='NWS' pady='10'/>
-      </widget>
 
-      <widget type='Scrollbar' name='partition.scroll'>
-	<widget_attribute orient='vertical'/>
-	<grid_location row='0' column='4' sticky='NS' pady='10'/>
-      </widget>
-
-      <widget type='Button'>
-	<widget_attribute text='new'/>
-	<grid_location row='1' column='0' sticky='W'/>
-      </widget>
-
-      <widget type='Button'>
-	<widget_attribute text='edit'/>
-	<grid_location row='1' column='1' padx='10'/>
-      </widget>
-
-      <widget type='Button'>
-	<widget_attribute text='delete'/>
-	<grid_location row='1' column='2' padx='10'/>
-      </widget>
-
-      <widget type='Button'>
-	<widget_attribute text='reset'/>
-	<grid_location row='1' column='3' sticky='E'/>
-      </widget>
+    <widget type='Listbox'>
+	    <widget_attribute width='20' height='10'/>
+	    <grid_location row='0' column='1' padx='10'/>
     </widget>
   </widget>
+	
+  <widget type='Frame'>
+    <grid_management rows='2' columns='5'>
+	    <configure column='3' weight='1'/>
+    </grid_management>
+    <grid_location row='1' column='0' sticky='NW'/>
+    <action>
+	      <scroll scrolling='partition.scroll' scrolled='partition.list'/>
+    </action>
+
+    <widget type='Listbox' name='partition.list'>
+	    <widget_attribute width='60'/>
+	    <grid_location row='0' column='0' columnspan='4' sticky='NWS' pady='10'/>
+    </widget>
+
+    <widget type='Scrollbar' name='partition.scroll'>
+	    <widget_attribute orient='vertical'/>
+	    <grid_location row='0' column='4' sticky='NS' pady='10'/>
+    </widget>
+
+    <widget type='Button'>
+	    <widget_attribute text='new'/>
+	    <grid_location row='1' column='0' sticky='W'/>
+    </widget>
+
+    <widget type='Button'>
+	    <widget_attribute text='edit'/>
+	    <grid_location row='1' column='1' padx='10'/>
+    </widget>
+
+    <widget type='Button'>
+	    <widget_attribute text='delete'/>
+	    <grid_location row='1' column='2' padx='10'/>
+    </widget>
+
+    <widget type='Button'>
+	    <widget_attribute text='reset'/>
+	  <grid_location row='1' column='3' sticky='E'/>
+    </widget>
+  </widget>
+</widget>
 
 <!--
         column 0           column 1                column 2
@@ -256,167 +263,181 @@ row 2 |           _______________    __________________                      |
 
     <widget type='Frame'>
       <grid_management rows='2' columns='2'>
-	<configure row='1' weight='1'/>
-	<configure column='0' weight='1'/>
+        <configure row='1' weight='1'/>
+        <configure column='0' weight='1'/>
       </grid_management>
       <grid_location row='0' column='0' rowspan='3' sticky='NSWE'/>
       <action>
-	<scroll scrolling='raid_raw.scroll' scrolled='raid_raw.list'/>
+        <scroll scrolling='raid_raw.scroll' scrolled='raid_raw.list'/>
       </action> 
-
-      <widget type='Label'>
-	<widget_attribute text='Raw'/>
-	<grid_location row='0' column='0' sticky='W'/>
-      </widget>
-      <widget type='Listbox' name='raid_raw.list'>
-	<widget_attribute listvariable='raid_raw_devs'/>
-	<grid_location row='1' column='0' sticky='NWES'/>
-	<variable name='raid_raw_devs' type='StringVar'/>
-	<action init='raid_raw_init'/>
-      </widget>
-
-      <widget type='Scrollbar' name='raid_raw.scroll'>
-	<widget_attribute orient='vertical'/>
-	<grid_location row='1' column='1' sticky='NS'/>
-      </widget>
+      
+    <widget type='Label'>
+	    <widget_attribute text='Raw'/>
+	    <grid_location row='0' column='0' sticky='W'/>
     </widget>
 
-    <!-- active dev list -->
-    <widget type='Frame'>
-      <grid_management rows='3' columns='2'>
-	<configure row='1' weight='1'/>
-	<configure row='2' weight='1'/>
-	<configure column='1' weight='1'/>
-      </grid_management>
-      <grid_location row='0' column='1' sticky='NWES'/>
-
-      <widget type='Label'>
-	<widget_attribute text='Active'/>
-	<grid_location row='0' column='1' sticky='W'/>
-      </widget>
-      <widget type='Button'>
-	<widget_attribute text='-&gt;' command='raid_raw_to_active'/>
-	<grid_location row='1' column='0' sticky='S'/>
-      </widget>
-      <widget type='Button'>
-	<widget_attribute text='&lt;-' command='raid_active_to_raw'/>
-	<grid_location row='2' column='0' sticky='N'/>
-      </widget>
-      <widget type='Listbox' name='raid_active.list'>
-	<widget_attribute listvariable='raid_active_devs'/>
-	<grid_location row='1' column='1' rowspan='2' sticky='NWES'/>
-	<variable name='raid_active_devs' type='StringVar'/>
-      </widget>
+    <widget type='Listbox' name='raid_raw.list'>
+	    <widget_attribute listvariable='raid_raw_devs'/>
+	    <grid_location row='1' column='0' sticky='NWES'/>
+	    <variable name='raid_raw_devs' type='StringVar'/>
+	    <action init='raid_raw_init'/>
     </widget>
 
-    <!-- spare dev list -->
-    <widget type='Frame'>
-      <grid_management rows='3' columns='2'>
-	<configure row='1' weight='1'/>
-	<configure row='2' weight='1'/>
-	<configure column='1' weight='1'/>
-      </grid_management>
-      <grid_location row='1' column='1' sticky='NWES'/>
-
-      <widget type='Label'>
-	<widget_attribute text='Spare'/>
-	<grid_location row='0' column='1' sticky='W'/>
-      </widget>
-      <widget type='Button'>
-	<widget_attribute text='-&gt;' command='raid_raw_to_spare'/>
-	<grid_location row='1' column='0' sticky='S'/>
-      </widget>
-      <widget type='Button'>
-	<widget_attribute text='&lt;-' command='raid_spare_to_raw'/>
-	<grid_location row='2' column='0' sticky='N'/>
-      </widget>
-      <widget type='Listbox' name='raid_spare.list'>
-	<widget_attribute listvariable='raid_spare_devs'/>
-	<grid_location row='1' column='1' rowspan='2' sticky='NWES'/>
-	<variable name='raid_spare_devs' type='StringVar'/>
-      </widget>
-    </widget>
-
-    <!-- radio button for raid level -->
-    <widget type='Frame'>
-      <grid_location row='2' column='1' />
-      <variable name='raid_level' type='StringVar'/>
-
-      <widget type='Label'>
-	<widget_attribute text='Level'/>
-	<grid_location row='0' column='0' sticky='W'/>
-      </widget>
-      <widget type='Radiobutton' name='raid_level_0'>
-	<widget_attribute text='Raid 0' variable='raid_level' value='0'/>
-	<grid_location row='1' column='0'/>
-      </widget>
-      <widget type='Radiobutton' name='raid_level_1'>
-	<widget_attribute text='Raid 1' variable='raid_level' value='1'/>
-	<grid_location row='2' column='0'/>
-      </widget>
-      <widget type='Radiobutton' name='raid_level_5'>
-	<widget_attribute text='Raid 5' variable='raid_level' value='5'/>
-	<grid_location row='3' column='0'/>
-      </widget>
-    </widget>
-
-    <!-- raid partitions -->
-    <widget type='Frame'>
-      <grid_management rows='3' columns='2'>
-	<configure row='1' weight='1'/>
-	<configure row='2' weight='1'/>
-	<configure column='1' weight='1'/>
-      </grid_management>
-      <grid_location row='0' column='2' rowspan='2'/>
-
-      <widget type='Label'>
-	<widget_attribute text='Device'/>
-	<grid_location row='0' column='1' sticky='W'/>
-      </widget>
-      <widget type='Button'>
-	<widget_attribute text='-&gt;' command='raid_device_add'/>
-	<grid_location row='1' column='0' sticky='S'/>
-      </widget>
-      <widget type='Button'>
-	<widget_attribute text='&lt;-' command='raid_device_delete'/>
-	<grid_location row='2' column='0' sticky='N'/>
-      </widget>
-      <widget type='Listbox' name='raid_dev.list'>
-	<widget_attribute listvariable='raid_devs'/>
-	<grid_location row='1' column='1' rowspan='2'/>
-	<variable name='raid_devs' type='StringVar'/>
-	<action init='raid_device_init'/>
-	<binding sequence='&lt;&lt;ListboxSelect&gt;&gt;' function='raid_device_list_detail'/>
-      </widget>
-    </widget>
-
-    <!-- display area, for raid device detail -->
-    <widget type='Frame'>
-      <grid_management rows='3' columns='1'>
-	<configure row='0' weight='1'/>
-	<configure row='1' weight='1'/>
-	<configure row='2' weight='2'/>
-      </grid_management>
-      <grid_location row='2' column='2'/>
-
-      <widget type='Label'>
-	<widget_attribute textvariable='raid_detail_active'/>
-	<grid_location row='0' column='0' sticky='W' />
-	<variable name='raid_detail_active' type='StringVar'/>
-      </widget>
-      <widget type='Label'>
-	<widget_attribute textvariable='raid_detail_spare'/>
-	<grid_location row='1' column='0' sticky='W' />
-	<variable name='raid_detail_spare' type='StringVar'/>
-      </widget>
-      <widget type='Label'>
-	<widget_attribute textvariable='raid_detail_level'/>
-	<grid_location row='2' column='0' sticky='W' />
-	<variable name='raid_detail_level' type='StringVar'/>
-      </widget>
+    <widget type='Scrollbar' name='raid_raw.scroll'>
+	    <widget_attribute orient='vertical'/>
+	    <grid_location row='1' column='1' sticky='NS'/>
     </widget>
   </widget>
 
+  <!-- active dev list -->
+  <widget type='Frame'>
+    <grid_management rows='3' columns='2'>
+      <configure row='1' weight='1'/>
+      <configure row='2' weight='1'/>
+      <configure column='1' weight='1'/>
+    </grid_management>
+    <grid_location row='0' column='1' sticky='NWES'/>
+
+    <widget type='Label'>
+	    <widget_attribute text='Active'/>
+	    <grid_location row='0' column='1' sticky='W'/>
+    </widget>
+
+    <widget type='Button'>
+	    <widget_attribute text='-&gt;' command='raid_raw_to_active'/>
+	    <grid_location row='1' column='0' sticky='S'/>
+    </widget>
+
+    <widget type='Button'>
+	    <widget_attribute text='&lt;-' command='raid_active_to_raw'/>
+	    <grid_location row='2' column='0' sticky='N'/>
+    </widget>
+
+    <widget type='Listbox' name='raid_active.list'>
+	    <widget_attribute listvariable='raid_active_devs'/>
+	    <grid_location row='1' column='1' rowspan='2' sticky='NWES'/>
+	    <variable name='raid_active_devs' type='StringVar'/>
+    </widget>
+  </widget>
+
+  <!-- spare dev list -->
+  <widget type='Frame'>
+    <grid_management rows='3' columns='2'>
+      <configure row='1' weight='1'/>
+      <configure row='2' weight='1'/>
+      <configure column='1' weight='1'/>
+    </grid_management>
+    <grid_location row='1' column='1' sticky='NWES'/>
+
+    <widget type='Label'>
+    	<widget_attribute text='Spare'/>
+	    <grid_location row='0' column='1' sticky='W'/>
+    </widget>
+
+    <widget type='Button'>
+	    <widget_attribute text='-&gt;' command='raid_raw_to_spare'/>
+	    <grid_location row='1' column='0' sticky='S'/>
+    </widget>
+
+    <widget type='Button'>
+	    <widget_attribute text='&lt;-' command='raid_spare_to_raw'/>
+	    <grid_location row='2' column='0' sticky='N'/>
+    </widget>
+
+    <widget type='Listbox' name='raid_spare.list'>
+	    <widget_attribute listvariable='raid_spare_devs'/>
+	    <grid_location row='1' column='1' rowspan='2' sticky='NWES'/>
+	    <variable name='raid_spare_devs' type='StringVar'/>
+    </widget>
+  </widget>
+
+  <!-- radio button for raid level -->
+  <widget type='Frame'>
+    <grid_location row='2' column='1' />
+    <variable name='raid_level' type='StringVar'/>
+    <widget type='Label'>
+	    <widget_attribute text='Level'/>
+	    <grid_location row='0' column='0' sticky='W'/>
+    </widget>
+    <widget type='Radiobutton' name='raid_level_0'>
+	    <widget_attribute text='Raid 0' variable='raid_level' value='0'/>
+	    <grid_location row='1' column='0'/>
+    </widget>
+
+    <widget type='Radiobutton' name='raid_level_1'>
+	    <widget_attribute text='Raid 1' variable='raid_level' value='1'/>
+	    <grid_location row='2' column='0'/>
+    </widget>
+
+    <widget type='Radiobutton' name='raid_level_5'>
+	    <widget_attribute text='Raid 5' variable='raid_level' value='5'/>
+	    <grid_location row='3' column='0'/>
+    </widget>
+  </widget>
+
+  <!-- raid partitions -->
+  <widget type='Frame'>
+    <grid_management rows='3' columns='2'>
+	  <configure row='1' weight='1'/>
+	  <configure row='2' weight='1'/>
+	  <configure column='1' weight='1'/>
+    </grid_management>
+
+    <grid_location row='0' column='2' rowspan='2'/>
+
+    <widget type='Label'>
+      <widget_attribute text='Device'/>
+      <grid_location row='0' column='1' sticky='W'/>
+    </widget>
+
+    <widget type='Button'>
+      <widget_attribute text='-&gt;' command='raid_device_add'/>
+      <grid_location row='1' column='0' sticky='S'/>
+    </widget>
+
+    <widget type='Button'>
+      <widget_attribute text='&lt;-' command='raid_device_delete'/>
+      <grid_location row='2' column='0' sticky='N'/>
+    </widget>
+
+    <widget type='Listbox' name='raid_dev.list'>
+      <widget_attribute listvariable='raid_devs'/>
+      <grid_location row='1' column='1' rowspan='2'/>
+      <variable name='raid_devs' type='StringVar'/>
+      <action init='raid_device_init'/>
+      <binding sequence='&lt;&lt;ListboxSelect&gt;&gt;' function='raid_device_list_detail'/>
+    </widget>
+  </widget>
+
+  <!-- display area, for raid device detail -->
+  <widget type='Frame'>
+    <grid_management rows='3' columns='1'>
+      <configure row='0' weight='1'/>
+      <configure row='1' weight='1'/>
+      <configure row='2' weight='2'/>
+    </grid_management>
+    <grid_location row='2' column='2'/>
+
+    <widget type='Label'>
+      <widget_attribute textvariable='raid_detail_active'/>
+      <grid_location row='0' column='0' sticky='W' />
+      <variable name='raid_detail_active' type='StringVar'/>
+    </widget>
+
+    <widget type='Label'>
+      <widget_attribute textvariable='raid_detail_spare'/>
+      <grid_location row='1' column='0' sticky='W' />
+      <variable name='raid_detail_spare' type='StringVar'/>
+    </widget>
+
+    <widget type='Label'>
+      <widget_attribute textvariable='raid_detail_level'/>
+      <grid_location row='2' column='0' sticky='W' />
+      <variable name='raid_detail_level' type='StringVar'/>
+    </widget>
+  </widget>
+</widget>
+
 <!--
         column 0            column 1            column 2
        ____________________________________________________________
@@ -448,31 +469,32 @@ row 4 |                                                            |
 
     <widget type='Frame'>
       <grid_management rows='2' columns='2'>
-	<configure row='0' weight='1'/>
-	<configure column='0' weight='1'/>
+	      <configure row='0' weight='1'/>
+        <configure column='0' weight='1'/>
       </grid_management>
       <grid_location row='0' column='0' columnspan='2' padx='20' pady='20' sticky='NSWE'/>
 
       <action>
-	<scroll scrolling='mount.scroll.v' scrolled='mount.list'/>
-	<scroll scrolling='mount.scroll.h' scrolled='mount.list'/>
+	      <scroll scrolling='mount.scroll.v' scrolled='mount.list'/>
+	      <scroll scrolling='mount.scroll.h' scrolled='mount.list'/>
       </action>
 
       <widget type='Listbox' name='mount.list'>
-	<widget_attribute listvariable='mount.list'/>
-	<grid_location row='0' column='0' sticky='NSWE'/>
-	<variable name='mount.list' type='StringVar'/>
-	<action init='mount_list_init'/>
-	<binding sequence='&lt;&lt;ListboxSelect&gt;&gt;' function='mount_list_modify'/>
+        <widget_attribute listvariable='mount.list'/>
+        <grid_location row='0' column='0' sticky='NSWE'/>
+        <variable name='mount.list' type='StringVar'/>
+        <action init='mount_list_init'/>
+        <binding sequence='&lt;&lt;ListboxSelect&gt;&gt;' function='mount_list_modify'/>
       </widget>
+
       <widget type='Scrollbar' name='mount.scroll.v'>
-	<widget_attribute orient='vertical'/>
-	<grid_location row='0' column='1' sticky='NS'/>
+        <widget_attribute orient='vertical'/>
+        <grid_location row='0' column='1' sticky='NS'/>
       </widget>
 
       <widget type='Scrollbar' name='mount.scroll.h'>
-	<widget_attribute orient='horizontal'/>
-	<grid_location row='1' column='0' sticky='WE'/>
+        <widget_attribute orient='horizontal'/>
+        <grid_location row='1' column='0' sticky='WE'/>
       </widget>
     </widget>
   </widget>
@@ -504,92 +526,94 @@ row 4 |                                                            |
       <variable name='network_config_method' type='StringVar'/>
 
       <widget type='Label'>
-	<widget_attribute text='host name'/>
-	<grid_location row='0' column='0' sticky='W'/>
+	      <widget_attribute text='host name'/>
+	      <grid_location row='0' column='0' sticky='W'/>
       </widget>
       <widget type='Entry'>
-	<widget_attribute width='12' textvariable='network_host_name'/>
-	<grid_location row='0' column='1' sticky='W'/>
-	<variable name='network_host_name' type='StringVar' value='localhost'/>
+        <widget_attribute width='12' textvariable='network_host_name'/>
+        <grid_location row='0' column='1' sticky='W'/>
+        <variable name='network_host_name' type='StringVar' value='localhost'/>
       </widget>
       
       <widget type='Label'>
-	<widget_attribute text='#NCM'/>
-	<grid_location row='1' column='0' rowspan='2' sticky='W'/>
+        <widget_attribute text='#NCM'/>
+        <grid_location row='1' column='0' rowspan='2' sticky='W'/>
       </widget>
 
       <widget type='Radiobutton' name='network_config_dynamic'>
-	<widget_attribute text='dynamic' variable='network_config_method' value='dynamic' command='ncm_dynamic'/>
-	<grid_location row='1' column='1' sticky='W'/>
+        <widget_attribute text='dynamic' variable='network_config_method' value='dynamic' command='ncm_dynamic'/>
+        <grid_location row='1' column='1' sticky='W'/>
       </widget>
 
       <widget type='Radiobutton' name='network_config_static'>
-	<widget_attribute text='static' variable='network_config_method' value='static' command='ncm_static'/>
-	<grid_location row='2' column='1' sticky='W'/>
+        <widget_attribute text='static' variable='network_config_method' value='static' command='ncm_static'/>
+        <grid_location row='2' column='1' sticky='W'/>
       </widget>
     </widget>
 
     <widget type='Frame'>
       <grid_location row='0' column='1'/>
-
       <widget type='Label'>
-	<widget_attribute text='Domain name'/>
-	<grid_location row='0' column='0'/>
+        <widget_attribute text='Domain name'/>
+        <grid_location row='0' column='0'/>
       </widget>
+
       <widget type='Entry' name='network_domain_name'>
-	<widget_attribute width='16' textvariable='network_domain_name'/>
-	<grid_location row='0' column='1' pady='2'/>
-	<variable name='network_domain_name' type='StringVar'/>
+        <widget_attribute width='16' textvariable='network_domain_name'/>
+        <grid_location row='0' column='1' pady='2'/>
+        <variable name='network_domain_name' type='StringVar'/>
       </widget>
 
       <widget type='Label'>
-	<widget_attribute text='IP'/>
-	<grid_location row='1' column='0'/>
+        <widget_attribute text='IP'/>
+        <grid_location row='1' column='0'/>
       </widget>
       <widget type='Entry' name='network_ip'>
-	<widget_attribute width='16' textvariable='network_ip'/>
-	<grid_location row='1' column='1' pady='2'/>
-	<variable name='network_ip' type='StringVar'/>
+        <widget_attribute width='16' textvariable='network_ip'/>
+        <grid_location row='1' column='1' pady='2'/>
+        <variable name='network_ip' type='StringVar'/>
       </widget>
 
       <widget type='Label'>
-	<widget_attribute text='Subnet mask'/>
-	<grid_location row='2' column='0'/>
+        <widget_attribute text='Subnet mask'/>
+        <grid_location row='2' column='0'/>
       </widget>
+
       <widget type='Entry' name='network_subnet_mask'>
-	<widget_attribute width='16' textvariable='network_subnet_mask'/>
-	<grid_location row='2' column='1' pady='2'/>
-	<variable name='network_subnet_mask' type='StringVar'/>
+        <widget_attribute width='16' textvariable='network_subnet_mask'/>
+        <grid_location row='2' column='1' pady='2'/>
+        <variable name='network_subnet_mask' type='StringVar'/>
       </widget>
 
       <widget type='Label'>
-	<widget_attribute text='Gateway'/>
-	<grid_location row='3' column='0'/>
+        <widget_attribute text='Gateway'/>
+        <grid_location row='3' column='0'/>
       </widget>
+
       <widget type='Entry' name='network_gateway'>
-	<widget_attribute width='16' textvariable='network_gateway'/>
-	<grid_location row='3' column='1' pady='2'/>
-	<variable name='network_gateway' type='StringVar'/>
+        <widget_attribute width='16' textvariable='network_gateway'/>
+        <grid_location row='3' column='1' pady='2'/>
+        <variable name='network_gateway' type='StringVar'/>
       </widget>
 
       <widget type='Label'>
-	<widget_attribute text='Primary DNS'/>
-	<grid_location row='4' column='0'/>
+        <widget_attribute text='Primary DNS'/>
+        <grid_location row='4' column='0'/>
       </widget>
       <widget type='Entry' name='network_primary_dns'>
-	<widget_attribute width='16' textvariable='network_primary_dns'/>
-	<grid_location row='4' column='1' pady='2'/>
-	<variable name='network_primary_dns' type='StringVar'/>
+        <widget_attribute width='16' textvariable='network_primary_dns'/>
+        <grid_location row='4' column='1' pady='2'/>
+        <variable name='network_primary_dns' type='StringVar'/>
       </widget>
 
       <widget type='Label'>
-	<widget_attribute text='Secondary DNS'/>
-	<grid_location row='5' column='0'/>
+        <widget_attribute text='Secondary DNS'/>
+        <grid_location row='5' column='0'/>
       </widget>
       <widget type='Entry' name='network_secondary_dns'>
-	<widget_attribute width='16' textvariable='network_secondary_dns'/>
-	<grid_location row='5' column='1' pady='2'/>
-	<variable name='network_secondary_dns' type='StringVar'/>
+        <widget_attribute width='16' textvariable='network_secondary_dns'/>
+        <grid_location row='5' column='1' pady='2'/>
+        <variable name='network_secondary_dns' type='StringVar'/>
       </widget>
     </widget>
   </widget>
@@ -624,17 +648,20 @@ row 4 |                                                            |
       <widget_attribute text='Mandatory'/>
       <grid_location row='0' column='0' />
     </widget>
+
     <widget type='Frame' construct='software_group_mandatory_construct'>
       <grid_management rows='x' columns='3'>
-	<configure column='0' weight='1'/>
-	<configure column='1' weight='1'/>
-	<configure column='2' weight='1'/>
+        <configure column='0' weight='1'/>
+        <configure column='1' weight='1'/>
+        <configure column='2' weight='1'/>
       </grid_management>
+
       <grid_location row='1' column='0'/>
+
       <!-- a template for software group mandatory item -->
       <widget type='Button' >
-	<widget_attribute text='' command='software_group_mandatory_item'/>
-	<grid_location row='0' column='0' sticky='W'/>
+        <widget_attribute text='' command='software_group_mandatory_item'/>
+        <grid_location row='0' column='0' sticky='W'/>
       </widget>
     </widget>
 
@@ -642,18 +669,19 @@ row 4 |                                                            |
       <widget_attribute text='Optional'/>
       <grid_location row='2' column='0'/>
     </widget>
+
     <widget type='Frame' construct='software_group_optional_construct'>
       <grid_management rows='x' columns='3'>
-	<configure column='0' weight='1'/>
-	<configure column='1' weight='1'/>
-	<configure column='2' weight='1'/>
+        <configure column='0' weight='1'/>
+        <configure column='1' weight='1'/>
+        <configure column='2' weight='1'/>
       </grid_management>
       <grid_location row='3' column='0'/>
       <action quit='software_group_optional_quit'/>
       <!-- a template for software group optional item -->
       <widget type='Checkbutton'>
-	<widget_attribute text='' variable='' command='' onvalue='yes' offvalue='no'/>
-	<grid_location row='0' column='0' sticky='W'/>
+        <widget_attribute text='' variable='' command='' onvalue='yes' offvalue='no'/>
+        <grid_location row='0' column='0' sticky='W'/>
       </widget>
     </widget>
   </widget>
@@ -759,63 +787,64 @@ row 4 |                                                            |
       <action init='mp_top_init'/>
 
       <widget type='Label'>
-	<widget_attribute text='Device'/>
-	<grid_location row='0' column='0' padx='10' sticky='W'/>
+        <widget_attribute text='Device'/>
+        <grid_location row='0' column='0' padx='10' sticky='W'/>
       </widget>
       <widget type='Label'>
-	<widget_attribute textvariable='mp_top_dev'/>
-	<grid_location row='0' column='1' sticky='W'/>
-	<variable name='mp_top_dev' type='StringVar'/>
+        <widget_attribute textvariable='mp_top_dev'/>
+        <grid_location row='0' column='1' sticky='W'/>
+        <variable name='mp_top_dev' type='StringVar'/>
       </widget>
 
       <widget type='Label'>
-	<widget_attribute text='Size'/>
-	<grid_location row='1' column='0' padx='10' sticky='W'/>
+        <widget_attribute text='Size'/>
+        <grid_location row='1' column='0' padx='10' sticky='W'/>
       </widget>
       <widget type='Label'>
-	<widget_attribute textvariable='mp_top_size'/>
-	<grid_location row='1' column='1' sticky='W'/>
-	<variable name='mp_top_size' type='StringVar'/>
+        <widget_attribute textvariable='mp_top_size'/>
+        <grid_location row='1' column='1' sticky='W'/>
+        <variable name='mp_top_size' type='StringVar'/>
       </widget>
 
       <widget type='Label'>
-	<widget_attribute text='Directory'/>
-	<grid_location row='2' column='0' padx='10' sticky='W'/>
+        <widget_attribute text='Directory'/>
+        <grid_location row='2' column='0' padx='10' sticky='W'/>
       </widget>
       <widget type='Entry'>
-	<widget_attribute width='10' textvariable='mp_top_dir'/>
-	<grid_location row='2' column='1' sticky='W'/>
-	<variable name='mp_top_dir' type='StringVar'/>
+        <widget_attribute width='10' textvariable='mp_top_dir'/>
+        <grid_location row='2' column='1' sticky='W'/>
+        <variable name='mp_top_dir' type='StringVar'/>
       </widget>
 
       <widget type='Radiobutton' name='mp_top_format'>
-	<widget_attribute text='Format' variable='mp_top_format' value='yes'/>
-	<grid_location row='3' column='0'/>
+        <widget_attribute text='Format' variable='mp_top_format' value='yes'/>
+        <grid_location row='3' column='0'/>
       </widget>
       <widget type='Radiobutton' name='mp_top_not_format'>
-	<widget_attribute text='Not-Format' variable='mp_top_format' value='no'/>
-	<grid_location row='3' column='1'/>
+        <widget_attribute text='Not-Format' variable='mp_top_format' value='no'/>
+        <grid_location row='3' column='1'/>
       </widget>
 
       <widget type='Label'>
-	<widget_attribute text='Filesystem'/>
-	<grid_location row='4' column='0' sticky='W'/>
+        <widget_attribute text='Filesystem'/>
+        <grid_location row='4' column='0' sticky='W'/>
       </widget>
       <widget type='Listbox' name='mp_top_fs'>
-	<widget_attribute listvariable='mp_top_fs'/>
-	<grid_location row='4' column='1' sticky='W'/>
-	<variable name='mp_top_fs' type='StringVar' value='ext2 ext3 reiserfs xfs jfs swap'/>
+        <widget_attribute listvariable='mp_top_fs'/>
+        <grid_location row='4' column='1' sticky='W'/>
+        <variable name='mp_top_fs' type='StringVar' value='ext2 ext3 reiserfs xfs jfs swap'/>
       </widget>
 
       <widget type='Button'>
-	<widget_attribute text='OK' command='mp_top_ok'/>
-	<grid_location row='5' column='0'/>
+        <widget_attribute text='OK' command='mp_top_ok'/>
+        <grid_location row='5' column='0'/>
       </widget>
       <widget type='Button'>
-	<widget_attribute text='Cancel' command='mp_top_cancel'/>
-	<grid_location row='5' column='1'/>
+        <widget_attribute text='Cancel' command='mp_top_cancel'/>
+        <grid_location row='5' column='1'/>
       </widget>
     </widget>
+
   </top_window>
 
 <!--
@@ -833,7 +862,7 @@ row 4 |                                                            |
 
 -->
 
- <widget type='Frame' name='prepar_installation'>
+  <widget type='Frame' name='prepar_installation'>
     <grid_management rows='2' columns='2'>
       <configure row='0' weight='1'/>
       <configure column='0' weight='1'/>
@@ -857,22 +886,21 @@ row 4 |                                                            |
     </widget>
   </widget>
 
-    <text key='#check-mount-point'>
-        <English>The mount point couldn't be mounted on because it has been used or it's particular. Plase read help infomation!</English>
-        <Chinese>挂载点已经被使用或者这个是一个特殊的挂载点, 不能这样挂载, 请看帮助文档</Chinese>
-    </text>   
+  <text key='#check-mount-point'>
+    <English>The mount point couldn't be mounted on because it has been used or it's particular. Plase read help infomation!</English>
+    <Chinese>挂载点已经被使用或者这个是一个特殊的挂载点, 不能这样挂载, 请看帮助文档</Chinese>
+  </text>   
 
-    <text key='#Copyright'>
-        <English>Copyright 2001-2010 Linx Technology Co., Ltd.</English>
-        <Chinese>北京凝思科技有限公司 版权所有</Chinese>
-    </text>
+  <text key='#Copyright'>
+    <English>Copyright 2001-2010 Linx Technology Co., Ltd.</English>
+    <Chinese>北京凝思科技有限公司 版权所有</Chinese>
+  </text>
 
 	<text key='#dependency.help'>
     <English>
     There are two kinds of dependent relationships. Dependent Functions and Dependent Packages.
     Dependent Functions ：To provide systems function of packages. the left column is the systematic functions, the right column provides function of packages.
     Dependent Packages : Current selection of the dependent packages on the missing package. The software package in the left column is depended by the software packages in the right column.
-
     </English>
     <Chinese>
     依赖关系分为两部分:功能依赖和软件包依赖。
@@ -917,7 +945,7 @@ row 4 |                                                            |
     </Chinese>
     </text>
 
-    <text key='#network.help'>
+  <text key='#network.help'>
     <English>
     Hostname is used to identify computers. It could identify a specific computer system in various forms of electronic transmissions.
     The installation program offers two ways to set an IP address of the host. One is automatically configuration (DHCP) and the other is manually configuration.
@@ -934,7 +962,7 @@ row 4 |                                                            |
     域名：表示一个单位、机构或个人在Internet上有一个确定的名称或位置。
     IP地址、子网掩码、网关、首选DNS、备用DNS：输入四个0~255的数字，用点隔开，如192.168.1.1
     </Chinese>
-    </text>
+  </text>
 
   <text key='#NCM'>
     <English>Network Configuration Management:</English>
@@ -947,13 +975,13 @@ row 4 |                                                            |
   </text>
 
   <text key='#raid-add-active-numbers'>
-      <English>Making a raid0 or raid1 needs two or more partitions.</English>
-      <Chinese>当制作raid0或raid1时，硬盘分区必须两个或两个以上。</Chinese>
+    <English>Making a raid0 or raid1 needs two or more partitions.</English>
+    <Chinese>当制作raid0或raid1时，硬盘分区必须两个或两个以上。</Chinese>
   </text>
 
   <text key='#raid-add-active-numbers-2'>
-      <English>Making a raid5 needs three or more partitions</English>
-      <Chinese>当制作raid5的时,硬盘分区必须三个或三个以上。</Chinese>
+    <English>Making a raid5 needs three or more partitions</English>
+    <Chinese>当制作raid5的时,硬盘分区必须三个或三个以上。</Chinese>
   </text>
 
   <text key='#raid-add-warning'>
@@ -966,9 +994,9 @@ row 4 |                                                            |
   <text key='#raid-delete-warning'>
     <English>An existing raid, which wasn't made during this installation process, can't be deleted.</English>
     <Chinese>对于一个早已存在的raid设备（不是由安装程序创建的），你不能把它删除。</Chinese>
-    </text>
+  </text>
 
-    <text key='#raid.help'>
+  <text key='#raid.help'>
     <English>
     RAID is a technology that provides increased storage reliability through redundancy, combining multiple low-cost, less-reliable disk drives components into a logical unit where all drives in the array are interdependent. 
     If you don't want to make a RAID, you could click "next" to skip this step. The installation will go on normally.
@@ -980,9 +1008,9 @@ row 4 |                                                            |
     如果用户不懂该技术可以直接点击下一步,系统将不制作RAID,并不影响系统的安装及运行。
     原始框中是满足制作RAID的硬盘分区,如sda1、sdb2等。设备框中是原本系统已经制作好的RAID,如md0、md1等。系装安装时将保留原有的RAID设备。若要制作新RAID,请在原始框中选中硬盘分区后通过点击"－>",硬盘分区会进入使用框或备用框中。要制作RAID，使用框中必须要有硬盘分区，可以有一个或多个。备用框中硬盘分区是可选的，可以有一个或多个,也可以没有。完成上步操作后在级别框中选择raid的级别，最后点击"->"在设备框中产生新的mdX设备。
     </Chinese>
-    </text>
+  </text>
 	
-    <text key='#serial number.help'>
+  <text key='#serial number.help'>
     <English>
     Serial number is the permission to run secure functions of Linx Rocky Secure OS.
     Please Input the correct serial number in the frame, so that secure functions could run.
@@ -994,9 +1022,9 @@ row 4 |                                                            |
     如何获取安装序列号请联系北京凝思科技有限公司。
     网站：www.linx-info.com
     </Chinese>
-    </text>
+  </text>
 
-    <text key='#service.help'>
+  <text key='#service.help'>
     <English>
     The color of the servers listed in the frame suggests whether they are self-starting since system startup. Gary means no, and the probable 
     reason is packages providing the servers haven't been selected to install.
@@ -1005,8 +1033,9 @@ row 4 |                                                            |
     显示框中表示系统启动过程中自动启动的服务。
     灰色选项说明不技持该服务，可能是因为没有选上该服务所对应的软件包。
     </Chinese>
-   </text>
-    <text key='#software group.help'>
+  </text>
+
+  <text key='#software group.help'>
     <English>
     There are two kinds of packages and package groups, one is mandatory, the other is optional.
     The mandatory packages of a group will be installed by default if you select the group. You could first click a group, and then select optional packages want to install in the pop-up dialog box.
@@ -1028,7 +1057,7 @@ row 4 |                                                            |
     多媒体类软件包组(multi-media)包括各种媒体库。多媒体类软件包都是可选软件包，可以自由选择安装。
     其它软件包组(kde、vm、network_tools)都是可选软件包，可以自由选择安装。
     </Chinese>
-   </text>
+  </text>
 
   <text key='#Welcome'>
     <English>Welcome to use Linx Rocky Secure Operating System v4.2</English>