Fix bug read-only root mounting. Added atime options for default.

netsetup
Mike Hiretsky 14 years ago
parent 8ffbeaa16c
commit 0f40fc9082

@ -116,13 +116,13 @@ class convertDictOpt:
_propertiesFileSystem = {"default": {"fileSystem":_defaultFS, _propertiesFileSystem = {"default": {"fileSystem":_defaultFS,
"isFormat":True, "isFormat":True,
"options":[]}, "options":["noatime"]},
"noformat":{"fileSystem":"", "noformat":{"fileSystem":"",
"isFormat":False, "isFormat":False,
"options":[]}, "options":["noatime"]},
"defaultflash":{"fileSystem":_defaultFlashFS, "defaultflash":{"fileSystem":_defaultFlashFS,
"isFormat":True, "isFormat":True,
"options":[]}} "options":["noatime"]}}
_ext2Options = {"options":["acl", "noacl", "bsddf", "minixdf", "check", _ext2Options = {"options":["acl", "noacl", "bsddf", "minixdf", "check",
"debug", "errors", "grpid", "bsdgroups", "debug", "errors", "grpid", "bsdgroups",
@ -618,12 +618,13 @@ class convertDictOpt:
if optFileSystem in self._propertiesFileSystem: if optFileSystem in self._propertiesFileSystem:
dictUpdateProperty["fileSystem"] = dictOptions["fileSystem"] dictUpdateProperty["fileSystem"] = dictOptions["fileSystem"]
optOptions = optProperties["options"] optOptions = optProperties["options"]
flagCheckOptOptions = False flagCheckOptOptions = True
if optOptions: if optOptions:
if optMountPoint != "/": if optMountPoint != "/":
dictUpdateProperty["options"] = optOptions dictUpdateProperty["options"] = optOptions
else: else:
flagCheckOptOptions = True flagCheckOptOptions = True
optProperties = dict(filter(lambda x: x[1], optProperties.items())) optProperties = dict(filter(lambda x: x[1], optProperties.items()))
optProperties.update(dictUpdateProperty) optProperties.update(dictUpdateProperty)
if dictOptions: if dictOptions:
@ -871,7 +872,7 @@ class cl_install(color_print):
prevRootDev = self.clVars.Get('os_install_dev_from') prevRootDev = self.clVars.Get('os_install_dev_from')
if prevRootDev: if prevRootDev:
listDisks += map(convObj, [{'mountPoint': '', listDisks += map(convObj, [{'mountPoint': '',
'options': [], 'options': ['noatime'],
'dev': prevRootDev, 'dev': prevRootDev,
'fileSystem': ''}]) 'fileSystem': ''}])
listBinds = map(convObj, listBinds) listBinds = map(convObj, listBinds)

Loading…
Cancel
Save