modified: ri_oper.py

modified:   ../xml/dependency.xml
    updata
This commit is contained in:
fling
2010-10-22 09:20:48 +08:00
parent b1cde67d43
commit 7cd8270e05
3 changed files with 101 additions and 60 deletions

View File

@@ -160,7 +160,7 @@ class Mount(Operation):
n = 0
for dir in set([ m.directory for m in ri_data.MountPoint.dict.values() if m.directory ]):
for k in ri_data.MountPoint.dict.keys():
if ri_data.MountPoint.dict[k] == dir and ri_data.MountPoint.dict[k].filesystem:
if ri_data.MountPoint.dict[k].directory == dir and ri_data.MountPoint.dict[k].filesystem:
# during configure fstab, use dict of Mount
Mount.dict[k]=dir
mount+='/dev/%s %s %s\n' %(k,dir,ri_data.MountPoint.dict[k].filesystem)
@@ -192,8 +192,9 @@ class ConfigureFstab(Mount):
def get_stdin(self):
fstab=''
# Note: Mount.dict are mount point. it isn't equal ri_data.MountPoint.dict
for k in Mount.dict.keys():
if ri_data.MountPoint.dict[k] != 'swap':
if ri_data.MountPoint.dict[k].filesystem != 'swap':
fstab += "/dev/%s %s %s\n" %(k,Mount.dict[k],ri_data.MountPoint.dict[k].filesystem)
for k in ri_data.MountPoint.dict.keys():