|
|
@ -611,7 +611,6 @@ class cl_install(color_print):
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
#self.clVars.Set("cl_root_path","/", True)
|
|
|
|
#self.clVars.Set("cl_root_path","/", True)
|
|
|
|
self.clVars.Set("cl_chroot_path","/", True)
|
|
|
|
self.clVars.Set("cl_chroot_path","/", True)
|
|
|
|
self.clVars.Set("cl_pass_action", "template", True)
|
|
|
|
|
|
|
|
self.clTempl = template(self.clVars)
|
|
|
|
self.clTempl = template(self.clVars)
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
if self.clTempl.getError():
|
|
|
|
if self.clTempl.getError():
|
|
|
@ -624,9 +623,9 @@ class cl_install(color_print):
|
|
|
|
self.printSUCCESS(_("Installation") + " Calculate Linux")
|
|
|
|
self.printSUCCESS(_("Installation") + " Calculate Linux")
|
|
|
|
self.defaultPrint("%s\n"%_("System information"))
|
|
|
|
self.defaultPrint("%s\n"%_("System information"))
|
|
|
|
self.printSUCCESS(_("Computer name")+": %s"%
|
|
|
|
self.printSUCCESS(_("Computer name")+": %s"%
|
|
|
|
self.clVars.Get('os_net_hostname'))
|
|
|
|
self.clVars.Get('os_install_net_hostname'))
|
|
|
|
self.printSUCCESS(_("Domain name")+": %s"%
|
|
|
|
self.printSUCCESS(_("Domain name")+": %s"%
|
|
|
|
self.clVars.Get('os_net_domain'))
|
|
|
|
self.clVars.Get('os_install_net_domain'))
|
|
|
|
self.printSUCCESS(_("Network devices")+": %s"%
|
|
|
|
self.printSUCCESS(_("Network devices")+": %s"%
|
|
|
|
self.clVars.Get("os_net_interfaces_info"))
|
|
|
|
self.clVars.Get("os_net_interfaces_info"))
|
|
|
|
self.printSUCCESS(_("Installed system")+": %s %s"%
|
|
|
|
self.printSUCCESS(_("Installed system")+": %s %s"%
|
|
|
@ -634,7 +633,7 @@ class cl_install(color_print):
|
|
|
|
self.clVars.Get('os_linux_ver')))
|
|
|
|
self.clVars.Get('os_linux_ver')))
|
|
|
|
self.defaultPrint("%s\n"%_("Hardware"))
|
|
|
|
self.defaultPrint("%s\n"%_("Hardware"))
|
|
|
|
self.printSUCCESS(_("Machine hardware name")+": %s"%
|
|
|
|
self.printSUCCESS(_("Machine hardware name")+": %s"%
|
|
|
|
self.clVars.Get('os_arch_machine'))
|
|
|
|
self.clVars.Get('os_install_arch_machine'))
|
|
|
|
self.printSUCCESS(_("Quantity processors")+": %s"%
|
|
|
|
self.printSUCCESS(_("Quantity processors")+": %s"%
|
|
|
|
self.clVars.Get('hr_cpu_num'))
|
|
|
|
self.clVars.Get('hr_cpu_num'))
|
|
|
|
self.printSUCCESS(_("Videocard vendor")+": %s"%
|
|
|
|
self.printSUCCESS(_("Videocard vendor")+": %s"%
|
|
|
@ -659,8 +658,8 @@ class cl_install(color_print):
|
|
|
|
tableObj.printReport(False)
|
|
|
|
tableObj.printReport(False)
|
|
|
|
|
|
|
|
|
|
|
|
self.defaultPrint("%s\n"%_("Network services"))
|
|
|
|
self.defaultPrint("%s\n"%_("Network services"))
|
|
|
|
self.printSUCCESS(_("Authentification")+": %s"%
|
|
|
|
#self.printSUCCESS(_("Authentification")+": %s"%
|
|
|
|
"<needed>")
|
|
|
|
# "<needed>")
|
|
|
|
self.printSUCCESS(_("PROXY")+": %s"%
|
|
|
|
self.printSUCCESS(_("PROXY")+": %s"%
|
|
|
|
self.clVars.Get('os_install_proxy') or "no")
|
|
|
|
self.clVars.Get('os_install_proxy') or "no")
|
|
|
|
self.printSUCCESS(_("NTP")+": %s"%
|
|
|
|
self.printSUCCESS(_("NTP")+": %s"%
|
|
|
@ -703,7 +702,6 @@ class cl_install(color_print):
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
#self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
#self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
self.clVars.Set("cl_chroot_path",directory, True)
|
|
|
|
self.clVars.Set("cl_chroot_path",directory, True)
|
|
|
|
self.clVars.Set("cl_pass_action", "install", True)
|
|
|
|
|
|
|
|
self.clTempl = template(self.clVars)
|
|
|
|
self.clTempl = template(self.clVars)
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
if self.clTempl.getError():
|
|
|
|
if self.clTempl.getError():
|
|
|
@ -1209,8 +1207,6 @@ class cl_install(color_print):
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def writeInstallVars(self):
|
|
|
|
def writeInstallVars(self):
|
|
|
|
self.clVars.Write('cl_pass_action','template', True,
|
|
|
|
|
|
|
|
header="install")
|
|
|
|
|
|
|
|
if not self.clVars.WriteVars(header="install"):
|
|
|
|
if not self.clVars.WriteVars(header="install"):
|
|
|
|
raise InstallError(self.getError())
|
|
|
|
raise InstallError(self.getError())
|
|
|
|
|
|
|
|
|
|
|
|