|
|
|
@ -1526,7 +1526,8 @@ class cl_install(color_print):
|
|
|
|
|
'boot',self.clVars.Get('os_install_initrd'))
|
|
|
|
|
return InitRamFs(initrdPath).cleanInitRamFs()
|
|
|
|
|
|
|
|
|
|
def afterCopyHDDinstall(self,targetDistr):
|
|
|
|
|
def afterCopyHDDinstall(self,targetDistr, addUsers, changePwdUsers,
|
|
|
|
|
migrateUsers):
|
|
|
|
|
"""Action performed after distributive copy for hdd install"""
|
|
|
|
|
# copy clt files from current system
|
|
|
|
|
self.printMessageForTest(_("Coping clt templates to new system"))
|
|
|
|
@ -1592,9 +1593,11 @@ the system") + " (yes/no)"
|
|
|
|
|
if dialogRes in (None,False):
|
|
|
|
|
return True
|
|
|
|
|
# set Users passwords
|
|
|
|
|
changePwdUsers = self.generateHashRoot(stdinRead=stdinReadPwd)
|
|
|
|
|
addUsers = self.generateHashUsers(stdinRead=stdinReadPwd)
|
|
|
|
|
migrateUsers = self.getNamesMigrateUsers()
|
|
|
|
|
if self.clVars.Get('os_install_root_type') != "flash":
|
|
|
|
|
changePwdUsers = \
|
|
|
|
|
self.generateHashRoot(stdinRead=stdinReadPwd)
|
|
|
|
|
addUsers = self.generateHashUsers(stdinRead=stdinReadPwd)
|
|
|
|
|
migrateUsers = self.getNamesMigrateUsers()
|
|
|
|
|
# cmd options
|
|
|
|
|
self.printMessageForTest(_("Formating partitions"))
|
|
|
|
|
targetDistr.performFormat()
|
|
|
|
@ -1609,7 +1612,8 @@ the system") + " (yes/no)"
|
|
|
|
|
self.printByResult(True)
|
|
|
|
|
|
|
|
|
|
if self.clVars.Get('os_install_root_type') != "flash":
|
|
|
|
|
self.afterCopyHDDinstall(targetDistr)
|
|
|
|
|
self.afterCopyHDDinstall(targetDistr, addUsers,
|
|
|
|
|
changePwdUsers, migrateUsers)
|
|
|
|
|
# change boot config
|
|
|
|
|
if self.clVars.Get('os_install_mbr'):
|
|
|
|
|
self.printMessageForTest(_("Preparing system for reboot"))
|
|
|
|
|