From 400911c41a044babbac6caed48ca39147e33cfae Mon Sep 17 00:00:00 2001
From: fling <fling@linx-info.com>
Date: Fri, 15 Oct 2010 10:06:35 +0800
Subject: [PATCH] 	modified:   ri_data.py 	modified:   ri_tk_cmd.py

---
 interface/ri_data.py   | 30 +++++-------------------------
 interface/ri_tk_cmd.py |  4 ----
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/interface/ri_data.py b/interface/ri_data.py
index a79ab0d..9af2ee9 100644
--- a/interface/ri_data.py
+++ b/interface/ri_data.py
@@ -350,16 +350,16 @@ class MountPoint:
     @staticmethod
     def init_from_internal():
         ''' init MountPoint from internal class Partition and class Raid '''
-        # add raid device in raid_devs
+        # clean MountPoint.list before update
+        MountPoint.list=[]
+        # add partitions in Raid.list
         raid_devs=Raid.dev_in_raid() 
-        devs = [ m.device for m in MountPoint.list ]
         for p in Partition.list:
-            if p.device not in devs and p.device not in raid_devs :
+            if  p.device not in raid_devs :
                 MountPoint(p.device,fs=p.filesystem,sz=p.size)
 
         for r in Raid.list:
-            if r.device not in devs:
-                MountPoint(r.device,sz=r.size)
+            MountPoint(r.device,sz=r.size)
 
         # now process whether a partition or raid was removed
         s1 = set([ m.device for m in MountPoint.list ])
@@ -371,26 +371,6 @@ class MountPoint:
                     break
         # sort
         MountPoint.list.sort(key=MountPoint.device)
-    
-    @staticmethod
-    def del_mount_dev(dev):
-        '''del device in mount list'''
-        devs = [ m.device for m in MountPoint.list ]
-        for i in range(len(MountPoint.list)):
-            if dev in devs and dev == MountPoint.list[i].device:
-                del MountPoint.list[i]
-                break
-        MountPoint.list.sort(key=MountPoint.device)
-
-    @staticmethod
-    def add_mount_dev(dev):
-        '''add device into mount list'''
-        devs = [ m.device for m in MountPoint.list ]
-        for i in range(len(Partition.list)):
-            if dev not in devs and dev == Partition.list[i].device:
-                MountPoint(dev,fs=Partition.list[i].filesystem,sz=Partition.list[i].size)
-                break
-        MountPoint.list.sort(key=MountPoint.device)
                         
     @staticmethod
     def init_from_xml(node):
diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py
index ac3e284..3d98b93 100644
--- a/interface/ri_tk_cmd.py
+++ b/interface/ri_tk_cmd.py
@@ -352,8 +352,6 @@ def raid_device_add():
 
     dev = ri_data.Raid.get_next_device()
     ri_data.Raid(dev, "no", level, raid_calc_size(level, active), active, spare)
-    for d in active+spare: 
-        ri_data.MountPoint.del_mount_dev(d)
 
     raid_device_init()
     display.var_dict['raid_active_devs'].set(value='')
@@ -387,8 +385,6 @@ def raid_device_delete():
         display.var_dict['raid_active_devs'].set(value=tuple(active))
         display.var_dict['raid_spare_devs'].set(value=tuple(spare))
         del ri_data.Raid.list[idx]
-        for d in active+spare:
-            ri_data.MountPoint.add_mount_dev(d)
         raid_device_init()
 
 def raid_device_list_detail(*args):