From 5dcd8813bc9ae11899b0fb589367aefaa8c45da6 Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Mon, 11 Oct 2010 11:02:09 +0800
Subject: [PATCH 1/8] 	modified:   interface.xml     add messagebox
 "raid-add-active-warning"

---
 xml/interface.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xml/interface.xml b/xml/interface.xml
index d9220f7..fa782a0 100644
--- a/xml/interface.xml
+++ b/xml/interface.xml
@@ -727,6 +727,7 @@ row 4 |                                                            |
   <message_box name='previous' type='showinfo' title='install sequence' message='#first-step'/>
   <message_box name='raid_add_warning' type='showwarning' title='raid adding' message='#raid-add-warning'/>
   <message_box name='raid_delete_warning' type='showwarning' title='raid deleting' message='#raid-delete-warning'/>
+  <message_box name='raid_add_active_warning' type='showwarning' title='active' message='#raid-add-active-warning'/>
 <!--
                 column 0              column 1
           ________________________________________________
@@ -931,6 +932,11 @@ row 4 |                                                            |
     <Chinese>当添加raid设备时，活动设备列表不能为空，并且必须选定一个raid级别。</Chinese>
   </text>
 
+  <text key='#raid-add-active-warning'>
+      <English>Active display frame can not be empyt</English>
+      <Chinese>活动框不能为空</Chinese>
+  </text>
+
   <text key='#raid-delete-warning'>
     <English>You can not delete an existing raid, which is not made by I (install program)!</English>
     <Chinese>对于一个早已存在的raid设备（不是由安装程序创建的），你不能把它删除。</Chinese>

From 970b86768536a78730ff1b0a17ba38396c9c1e2c Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Mon, 11 Oct 2010 11:05:26 +0800
Subject: [PATCH 2/8] 	modified:   interface.xml     add messagebox
 "raid-add-active-warning" not empty

---
 xml/interface.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/interface.xml b/xml/interface.xml
index fa782a0..1ff4910 100644
--- a/xml/interface.xml
+++ b/xml/interface.xml
@@ -933,7 +933,7 @@ row 4 |                                                            |
   </text>
 
   <text key='#raid-add-active-warning'>
-      <English>Active display frame can not be empyt</English>
+      <English>Active display frame can not be empty</English>
       <Chinese>活动框不能为空</Chinese>
   </text>
 

From 31f924ac0915d75879c5e112859152292372aede Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Mon, 11 Oct 2010 11:06:52 +0800
Subject: [PATCH 3/8] 	modified:   ri_tk_cmd.py     bug1 raid_device_add():
 active can't be empty and add a messagebox for     active     bug2
 raid_device_delete(): eval argements can't be None string

---
 interface/ri_tk_cmd.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py
index 595fdbb..e17e5d0 100644
--- a/interface/ri_tk_cmd.py
+++ b/interface/ri_tk_cmd.py
@@ -326,8 +326,15 @@ devs  - raid component devices
 
 def raid_device_add():
     ''' add a new raid device '''
-    active = eval(display.var_dict['raid_active_devs'].get())
-    spare  = eval(display.var_dict['raid_spare_devs'].get())
+    if display.var_dict['raid_active_devs'].get()=='':
+        ri_widget.MessageBox.dict["raid_add_active_warning"].show()
+        return 
+    else:
+        active = eval(display.var_dict['raid_active_devs'].get())
+    if display.var_dict['raid_spare_devs'].get()=='':
+        spare=''
+    else:
+        spare  = eval(display.var_dict['raid_spare_devs'].get())
     level  = display.var_dict['raid_level'].get()
 
     if not active or not level:
@@ -353,9 +360,16 @@ def raid_device_delete():
         if r.from_os:
             ri_widget.MessageBox.dict["raid_delete_warning"].show()
             return
-        active = list(eval(display.var_dict['raid_active_devs'].get()))
+        if display.var_dict['raid_active_devs'].get() == '':
+            active=[]
+        else:
+            active = list(eval(display.var_dict['raid_active_devs'].get()))
+        if display.var_dict['raid_spare_devs'].get()=='':
+            spare=[]
+        else:
+            spare  = list(eval(display.var_dict['raid_spare_devs'].get()))
+
         active.extend(r.active_components)
-        spare  = list(eval(display.var_dict['raid_spare_devs'].get()))
         spare.extend(r.spare_components)
         # do not touch level
         display.var_dict['raid_active_devs'].set(value=tuple(active))

From 28e6b1138e13005470bb3f39cd6f91a1638b601d Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Mon, 11 Oct 2010 15:08:10 +0800
Subject: [PATCH 4/8] 	modified:   ri_tk_cmd.py

---
 interface/ri_tk_cmd.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py
index e17e5d0..27a67d2 100644
--- a/interface/ri_tk_cmd.py
+++ b/interface/ri_tk_cmd.py
@@ -330,11 +330,11 @@ def raid_device_add():
         ri_widget.MessageBox.dict["raid_add_active_warning"].show()
         return 
     else:
-        active = eval(display.var_dict['raid_active_devs'].get())
+        active = list(eval(display.var_dict['raid_active_devs'].get()))
     if display.var_dict['raid_spare_devs'].get()=='':
-        spare=''
+        spare=[]
     else:
-        spare  = eval(display.var_dict['raid_spare_devs'].get())
+        spare  = list(eval(display.var_dict['raid_spare_devs'].get()))
     level  = display.var_dict['raid_level'].get()
 
     if not active or not level:
@@ -342,7 +342,7 @@ def raid_device_add():
         return
 
     dev = ri_data.Raid.get_next_device()
-    ri_data.Raid(dev, False, level, raid_calc_size(level, active), active, spare)
+    ri_data.Raid(dev, "no", level, raid_calc_size(level, active), active, spare)
     raid_device_init()
     display.var_dict['raid_active_devs'].set(value='')
     display.var_dict['raid_spare_devs'].set(value='')
@@ -357,7 +357,7 @@ def raid_device_delete():
     if len(idxs) == 1:
         idx = int(idxs[0])
         r = ri_data.Raid.list[idx]
-        if r.from_os:
+        if r.from_os == 'yes':
             ri_widget.MessageBox.dict["raid_delete_warning"].show()
             return
         if display.var_dict['raid_active_devs'].get() == '':

From e4459f776b900efdc96710b9fa35a1f482b41da2 Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Mon, 11 Oct 2010 15:32:37 +0800
Subject: [PATCH 5/8] 	modified:   ri_tk_cmd.py     fix a raid size on
 mountpoint display

---
 interface/ri_tk_cmd.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py
index 27a67d2..0920b20 100644
--- a/interface/ri_tk_cmd.py
+++ b/interface/ri_tk_cmd.py
@@ -313,16 +313,20 @@ level - raid level (0/1/5)
 devs  - raid component devices
 '''
     # all devs shall have same size. 
+    unit=ri_data.Partition.unit
+    sz=99999999999
     for p in ri_data.Partition.list:
-        if p.device == devs[0]:
-            sz = p.size
-            break
+        if p.device in devs:
+            if  float(p.size[:-len(unit)])< float(sz):
+                sz = float(p.size[:-len(unit)])
     if level == '0':
-        return len(devs)*sz
+        sz=sz*len(devs)
+        return "%d%s"%(sz,unit)
     elif level == '1':
-        return sz
+        return "%d%s"%(sz,unit)
     elif level == '5':
-        return sz*(len(devs)-1)
+        sz=sz*(len(devs)-1)
+        return "%d%s"%(sz,unit)
 
 def raid_device_add():
     ''' add a new raid device '''

From cdf5d74201a50423a4535673495a38150dc74cb8 Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Mon, 11 Oct 2010 16:43:26 +0800
Subject: [PATCH 6/8] 	modified:   ri_tk_cmd.py     if a hard disk be made of
 a raid,the hard disk don't display on     mountpoint display frame.Node don't
 modified Mount's data

---
 interface/ri_tk_cmd.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py
index 0920b20..dcdfbd0 100644
--- a/interface/ri_tk_cmd.py
+++ b/interface/ri_tk_cmd.py
@@ -18,10 +18,16 @@ def serial_no_quit():
 
 def mount_list_init(w=''):
     ''' initialize mount list '''
-    ri_data.MountPoint.init_from_internal()
+    dev_in_raid = set()
     l = []
+    for r in ri_data.Raid.list:
+        dev_in_raid.update(r.active_components)
+        dev_in_raid.update(r.spare_components)
+    ri_data.MountPoint.init_from_internal()
     for m in ri_data.MountPoint.list:
         # get size from Partition info
+        if m.device in dev_in_raid:
+            continue
         sz = ri_data.Partition.get_size(m.device)
         if not sz:
             sz = ri_data.Raid.get_size(m.device)

From f81ae9deb6b0253edfed8d23850d39e3c99eff22 Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Mon, 11 Oct 2010 16:43:26 +0800
Subject: [PATCH 7/8] 	modified:   ri_tk_cmd.py     if a hard disk partition
 be made of a raid,the hard disk partition don't display on     mountpoint
 display frame.Node don't modified Mount's data

---
 interface/ri_tk_cmd.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py
index 0920b20..dcdfbd0 100644
--- a/interface/ri_tk_cmd.py
+++ b/interface/ri_tk_cmd.py
@@ -18,10 +18,16 @@ def serial_no_quit():
 
 def mount_list_init(w=''):
     ''' initialize mount list '''
-    ri_data.MountPoint.init_from_internal()
+    dev_in_raid = set()
     l = []
+    for r in ri_data.Raid.list:
+        dev_in_raid.update(r.active_components)
+        dev_in_raid.update(r.spare_components)
+    ri_data.MountPoint.init_from_internal()
     for m in ri_data.MountPoint.list:
         # get size from Partition info
+        if m.device in dev_in_raid:
+            continue
         sz = ri_data.Partition.get_size(m.device)
         if not sz:
             sz = ri_data.Raid.get_size(m.device)

From 47fdd104e6c116e10a60cbb833cb95f6847c13a9 Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Mon, 11 Oct 2010 17:11:52 +0800
Subject: [PATCH 8/8] 	modified:   install.xml     update example file

---
 xml/install.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xml/install.xml b/xml/install.xml
index 590f697..e55fe99 100644
--- a/xml/install.xml
+++ b/xml/install.xml
@@ -4,9 +4,9 @@
   </serial-number>
   <partitions unit='GB' label=''>
     <partition from_os='yes' start='0.00GB' flags='no' device='sda1' file-system='ext3' type='primary' size='31.5GB'/>
-    <partition from_os='yes' start='31.5GB' flags='no' device='sda2' file-system='ext3' type='primary' size='40.0GB'/>
-    <partition from_os='yes' start='75.5GB' flags='no' device='sda4' file-system='' type='extended' size='425GB'/>
-    <partition from_os='yes' start='75.5GB' flags='no' device='sda5' file-system='ext3' type='logical' size='300GB'/>
+    <partition from_os='yes' start='31.5GB' flags='yes' device='sda2' file-system='ext3' type='primary' size='40.0GB'/>
+    <partition from_os='yes' start='75.5GB' flags='yes' device='sda4' file-system='' type='extended' size='425GB'/>
+    <partition from_os='yes' start='75.5GB' flags='yes' device='sda5' file-system='ext3' type='logical' size='300GB'/>
     <partition from_os='yes' start='375GB' flags='no' device='sda6' file-system='ext3' type='logical' size='7.00GB'/>
     <partition from_os='yes' start='382GB' flags='no' device='sda7' file-system='' type='logical' size='4.85GB'/>
     <partition from_os='yes' start='387GB' flags='no' device='sda8' file-system='ext3' type='logical' size='113GB'/>