|
|
@ -1019,12 +1019,19 @@ class cl_install(color_print):
|
|
|
|
disk['systemId'] = None
|
|
|
|
disk['systemId'] = None
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def setAutoUpdate(self):
|
|
|
|
|
|
|
|
if self.clVars.Get('os_install_linux_system') == 'desktop':
|
|
|
|
|
|
|
|
self.clVars.Set('cl_autoupdate_set','on',force=True)
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
self.clVars.Set('cl_autoupdate_set','off',force=True)
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def setInstallOptions(self, listDisks, listBinds, listSwaps, listUsers,
|
|
|
|
def setInstallOptions(self, listDisks, listBinds, listSwaps, listUsers,
|
|
|
|
mbrDisk):
|
|
|
|
mbrDisk):
|
|
|
|
"""Set install options (set users, disks and mbr"""
|
|
|
|
"""Set install options (set users, disks and mbr"""
|
|
|
|
if self.setUsers(listUsers) and \
|
|
|
|
if self.setUsers(listUsers) and \
|
|
|
|
self.setDisks(listDisks,listBinds,listSwaps) and \
|
|
|
|
self.setDisks(listDisks,listBinds,listSwaps) and \
|
|
|
|
self.setMBR(mbrDisk):
|
|
|
|
self.setMBR(mbrDisk) and self.setAutoUpdate():
|
|
|
|
return self.createListOptions()
|
|
|
|
return self.createListOptions()
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return False
|
|
|
|
return False
|
|
|
@ -1312,7 +1319,10 @@ class cl_install(color_print):
|
|
|
|
def writeInstallVars(self):
|
|
|
|
def writeInstallVars(self):
|
|
|
|
if self.clVars.Get('os_root_type') == 'hdd':
|
|
|
|
if self.clVars.Get('os_root_type') == 'hdd':
|
|
|
|
self.clVars.Write("os_install_dev_from",
|
|
|
|
self.clVars.Write("os_install_dev_from",
|
|
|
|
self.clVars.Get('os_root_dev'), header="install",force=True)
|
|
|
|
self.clVars.Get('os_root_dev'),force=True)
|
|
|
|
|
|
|
|
self.clVars.Write("cl_autoupdate_set",
|
|
|
|
|
|
|
|
self.clVars.Get("cl_autoupdate_set"), header="main",
|
|
|
|
|
|
|
|
force=True)
|
|
|
|
#if not self.clVars.WriteVars(header="install"):
|
|
|
|
#if not self.clVars.WriteVars(header="install"):
|
|
|
|
# raise InstallError(self.getError())
|
|
|
|
# raise InstallError(self.getError())
|
|
|
|
|
|
|
|
|
|
|
|