Fix apply template. Fix installation.

netsetup
Mike Hiretsky 13 years ago
parent ff0f55e7bd
commit 28dd72bb0e

@ -26,8 +26,10 @@ from cl_template import template, templateClt
from cl_print import color_print
import cl_overriding
from cl_lang import lang
lang().setLanguage(sys.modules[__name__])
import cl_lang
tr = cl_lang.lang()
tr.setLocalDomain('cl_install')
tr.setLanguage(sys.modules[__name__])
#sys.path.insert(0, "/usr/lib/calculate-2.2/calculate-lib/pym")
#packagePath = "/usr/lib/calculate-2.2"

@ -418,7 +418,7 @@ class Distributive(object, SignalInterrupt):
def getBootDirectory(self):
"""Get directory which contains boot"""
return self.getDirectory()
return path.join(self.getDirectory(),"boot")
def _makeDirectory(self,pathname):
"""Make directory and parent.

@ -1308,7 +1308,7 @@ class fillVars(object, glob_attr):
def get_cl_chroot_grub(self):
"""Chroot for grub-mkconfig"""
if self.Get('os_install_scratch') == "on":
if self.Get('os_install_scratch') == "on":
return path.join(self.Get('cl_chroot_path'),"mnt/scratch")
else:
else:
return self.Get('cl_chroot_path')

Loading…
Cancel
Save