modified: ri_oper.py

update date list --> dict{}
This commit is contained in:
fling
2010-10-15 18:30:24 +08:00
parent 4f9ec86571
commit 64b99ddbd9

View File

@@ -112,7 +112,7 @@ class Format(Operation):
def get_stdin(self):
format=''
n = 0
for instance in ri_data.MountPoint.list:
for instance in ri_data.MountPoint.dict.values():
if instance.format == "yes" and instance.filesystem != '':
format+="/dev/%s %s\n"%(instance.device,instance.filesystem)
n += 1
@@ -126,7 +126,7 @@ class MakeRaid(Operation):
def get_stdin(self):
args = ''
n = 0
for instance in ri_data.Raid.list:
for instance in ri_data.Raid.dict.values():
if instance.from_os == 'no':
args += '-n /dev/%s -l %s -s %s -a %s\n' %(instance.device, instance.level, \
','.join([ '/dev/%s' %sp for sp in instance.spare_components]), \
@@ -140,7 +140,7 @@ class MakeRaidConfigure(Operation):
def __init__(self,scr):
Operation.__init__(self,"Generate /etc/mdadm.conf",u"生成raid配置文件","mkraidconf.sh",scr)
def install(self):
if ri_data.Raid.list:
if ri_data.Raid.dict.values():
return Operation.install(self)
else:
max = Rate.value+self.score <100 and Rate.value+self.score or 100
@@ -158,7 +158,7 @@ class Mount(Operation):
def get_stdin(self):
mount=''
n = 0
for instance in ri_data.MountPoint.list:
for instance in ri_data.MountPoint.dict.values():
if instance.directory != '' and instance.filesystem !='':
mount+="/dev/%s %s %s\n"%(instance.device,instance.directory,instance.filesystem)
n += 1
@@ -309,7 +309,7 @@ class ConfigureBootloader(Operation):
bootloader=['-t',tp,'-o',list[0][5:].split('.')[0]+'.'+list[0][5:].split('.')[1]]
for instance in ri_data.MountPoint.list:
for instance in ri_data.MountPoint.dict.values():
if instance.directory == '/' and not isroot:
bootloader+=['-r',instance.device]
print "root"