|
|
@ -77,6 +77,11 @@ class VariableClBuilderAvailableDev(Variable):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
type = "list"
|
|
|
|
type = "list"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get(self):
|
|
|
|
|
|
|
|
if self.Get('os_root_type') == "livecd":
|
|
|
|
|
|
|
|
return ["/run/initramfs/workspace/var/calculate/assemble"]
|
|
|
|
|
|
|
|
return []
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class VariableClBuilderDeviceSpool(ReadonlyVariable):
|
|
|
|
class VariableClBuilderDeviceSpool(ReadonlyVariable):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
@ -656,17 +661,27 @@ class VariableClBuilderImageFilename(Variable):
|
|
|
|
if not value:
|
|
|
|
if not value:
|
|
|
|
raise VariableError(_("You must specify image filename"))
|
|
|
|
raise VariableError(_("You must specify image filename"))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _isoname(self):
|
|
|
|
|
|
|
|
shortname = self.Get('os_builder_linux_shortname').lower()
|
|
|
|
|
|
|
|
buildnumber = self.Get('os_builder_linux_build')
|
|
|
|
|
|
|
|
arch = self.Get('os_builder_arch_machine')
|
|
|
|
|
|
|
|
return "%s-%s-%s.iso" % (shortname, buildnumber,
|
|
|
|
|
|
|
|
arch)
|
|
|
|
|
|
|
|
|
|
|
|
def get(self):
|
|
|
|
def get(self):
|
|
|
|
base_dn = self.Get('cl_builder_base_path')
|
|
|
|
if self.Get('os_root_type') == 'livecd':
|
|
|
|
build_id = self.Get('cl_builder_id')
|
|
|
|
base_dn = self.Get('cl_builder_base_path')
|
|
|
|
build_id_path = self.Get('cl_builder_id_path')
|
|
|
|
build_id = self.Get('cl_builder_id')
|
|
|
|
if build_id:
|
|
|
|
build_id_path = self.Get('cl_builder_id_path')
|
|
|
|
shortname = self.Get('os_builder_linux_shortname').lower()
|
|
|
|
if build_id:
|
|
|
|
buildnumber = self.Get('os_builder_linux_build')
|
|
|
|
imagename = self._isoname()
|
|
|
|
arch = self.Get('os_builder_arch_machine')
|
|
|
|
return path.join(base_dn, build_id_path, "linux", imagename)
|
|
|
|
imagename = "%s-%s-%s.iso" % (shortname, buildnumber,
|
|
|
|
else:
|
|
|
|
arch)
|
|
|
|
build_id = self.Get('cl_builder_id')
|
|
|
|
return path.join(base_dn, build_id_path, "linux", imagename)
|
|
|
|
base_dn = '/run/initramfs/live/iso'
|
|
|
|
|
|
|
|
if build_id:
|
|
|
|
|
|
|
|
imagename = self._isoname()
|
|
|
|
|
|
|
|
return path.join(base_dn, imagename)
|
|
|
|
return ""
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -674,7 +689,13 @@ class VariableClBuilderIsoBasePath(Variable):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
Базовый путь, где будут подготавливаться данные, которые будут запакованы в iso
|
|
|
|
Базовый путь, где будут подготавливаться данные, которые будут запакованы в iso
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
value = "/var/calculate/tmp"
|
|
|
|
livecd_value = '/run/initramfs/live/tmp'
|
|
|
|
|
|
|
|
default_value = "/var/calculate/tmp"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get(self):
|
|
|
|
|
|
|
|
if self.Get('os_root_type') == 'livecd':
|
|
|
|
|
|
|
|
return self.livecd_value
|
|
|
|
|
|
|
|
return self.default_value
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class VariableClBuilderIsoPath(ReadonlyVariable):
|
|
|
|
class VariableClBuilderIsoPath(ReadonlyVariable):
|
|
|
|