|
|
|
@ -947,6 +947,18 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
|
self.clTempl.closeFiles()
|
|
|
|
|
self.clTempl = None
|
|
|
|
|
|
|
|
|
|
def applyTemplatesFlash(self,directory):
|
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
|
#self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
|
self.clVars.Set("cl_chroot_path","/", True)
|
|
|
|
|
self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
|
self.clTempl = template(self.clVars,cltObj=False)
|
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
|
if self.clTempl.getError():
|
|
|
|
|
raise InstallError(self.clTempl.getError())
|
|
|
|
|
else:
|
|
|
|
|
return dirsFiles
|
|
|
|
|
|
|
|
|
|
def applyTemplates(self,directory):
|
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
|
#self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
@ -1846,6 +1858,13 @@ the system") + " (yes/no)"
|
|
|
|
|
if self.clVars.Get('os_install_root_type') != "flash":
|
|
|
|
|
self.afterCopyHDDinstall(targetDistr, addUsers,
|
|
|
|
|
changePwdUsers, migrateUsers)
|
|
|
|
|
else:
|
|
|
|
|
# join templates
|
|
|
|
|
self.printMessageForTest(
|
|
|
|
|
_("Configure of flash installation"))
|
|
|
|
|
self.applyTemplatesFlash(targetDistr.getDirectory())
|
|
|
|
|
self.printByResult(True)
|
|
|
|
|
self.closeClTemplate()
|
|
|
|
|
# change boot config
|
|
|
|
|
if self.clVars.Get('os_install_mbr'):
|
|
|
|
|
self.printMessageForTest(_("Preparing system for reboot"))
|
|
|
|
|