modified: ri_data.py

modified:   ri_tk_cmd.py
This commit is contained in:
fling
2010-10-15 10:06:35 +08:00
parent 60260f1cc4
commit 400911c41a
2 changed files with 5 additions and 29 deletions

View File

@@ -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):