almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow compression type be specified in lorax.conf

Browse Source
This commit is contained in:
Martin Gracik 2011-04-21 17:06:47 +02:00
parent 79b6e5bfa1
commit 421e4c3a00
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pylorax/__init__.py
View File

@ -98,6 +98,13 @@ class Lorax(BaseLoraxClass):
self.conf.add_section("templates") self.conf.add_section("templates")
self.conf.set("templates", "ramdisk", "ramdisk.ltmpl") self.conf.set("templates", "ramdisk", "ramdisk.ltmpl")
self.conf.add_section("yum")
self.conf.set("yum", "skipbroken", "0")
self.conf.add_section("compression")
self.conf.set("compression", "type", "xz")
self.conf.set("compression", "speed", "9")
# read the config file # read the config file
if os.path.isfile(conf_file): if os.path.isfile(conf_file):
self.conf.read(conf_file) self.conf.read(conf_file)
@ -251,7 +258,9 @@ class Lorax(BaseLoraxClass):
# install packages # install packages
for package in required: for package in required:
self.installtree.yum.install(package) self.installtree.yum.install(package)
self.installtree.yum.process_transaction()
skipbroken = self.conf.getboolean("yum", "skipbroken")
self.installtree.yum.process_transaction(skipbroken)
# write .buildstamp # write .buildstamp
buildstamp = BuildStamp(self.workdir, self.product, self.version, buildstamp = BuildStamp(self.workdir, self.product, self.version,
@ -370,13 +379,18 @@ class Lorax(BaseLoraxClass):
factory = images.Factory() factory = images.Factory()
imgclass = factory.get_class(self.basearch) imgclass = factory.get_class(self.basearch)
ctype = self.conf.get("compression", "type")
cspeed = self.conf.get("compression", "speed")
i = imgclass(kernellist=self.outputtree.kernels, i = imgclass(kernellist=self.outputtree.kernels,
installtree=self.installtree, installtree=self.installtree,
outputroot=self.outputtree.root, outputroot=self.outputtree.root,
product=self.product, product=self.product,
version=self.version, version=self.version,
treeinfo=treeinfo, treeinfo=treeinfo,
basearch=self.basearch) basearch=self.basearch,
ctype=ctype,
cspeed=cspeed)
# backup required files # backup required files
i.backup_required(self.workdir) i.backup_required(self.workdir)

2
src/pylorax/constants.py
View File

@ -41,7 +41,6 @@ class LoraxRequiredCommands(dict):
self["DMSETUP"] = "dmsetup" self["DMSETUP"] = "dmsetup"
self["FIND"] = "find" self["FIND"] = "find"
self["GCONFTOOL"] = "gconftool-2" self["GCONFTOOL"] = "gconftool-2"
self["GZIP"] = "gzip"
self["IMPLANTISOMD5"] = "implantisomd5" self["IMPLANTISOMD5"] = "implantisomd5"
self["ISOHYBRID"] = "isohybrid" self["ISOHYBRID"] = "isohybrid"
self["LDCONFIG"] = "ldconfig" self["LDCONFIG"] = "ldconfig"
@ -54,7 +53,6 @@ class LoraxRequiredCommands(dict):
self["PARTED"] = "parted" self["PARTED"] = "parted"
self["SSHKEYGEN"] = "ssh-keygen" self["SSHKEYGEN"] = "ssh-keygen"
self["UMOUNT"] = "umount" self["UMOUNT"] = "umount"
self["XZ"] = "xz"
def __getattr__(self, attr): def __getattr__(self, attr):
return self[attr] return self[attr]

24
src/pylorax/images.py
View File

@ -79,7 +79,7 @@ SPARCDIR = "boot"
class PPC(object): class PPC(object):
def __init__(self, kernellist, installtree, outputroot, product, version, def __init__(self, kernellist, installtree, outputroot, product, version,
treeinfo, basearch): treeinfo, basearch, ctype, cspeed):
self.kernellist = kernellist self.kernellist = kernellist
self.installtree = installtree self.installtree = installtree
@ -88,6 +88,8 @@ class PPC(object):
self.version = version self.version = version
self.treeinfo = treeinfo self.treeinfo = treeinfo
self.basearch = basearch self.basearch = basearch
self.ctype = ctype
self.cspeed = cspeed
self.kernels, self.initrds = [], [] self.kernels, self.initrds = [], []
self.reqs = collections.defaultdict(str) self.reqs = collections.defaultdict(str)
@ -176,7 +178,7 @@ class PPC(object):
initrd.itype = kernel.ktype initrd.itype = kernel.ktype
logger.info("compressing the install tree") logger.info("compressing the install tree")
self.installtree.compress(initrd, kernel, type="gzip") self.installtree.compress(initrd, kernel, self.ctype, self.cspeed)
# add kernel and initrd to the list # add kernel and initrd to the list
self.kernels.append(kernel) self.kernels.append(kernel)
@ -359,7 +361,7 @@ class PPC(object):
class X86(object): class X86(object):
def __init__(self, kernellist, installtree, outputroot, product, version, def __init__(self, kernellist, installtree, outputroot, product, version,
treeinfo, basearch): treeinfo, basearch, ctype, cspeed):
self.kernellist = kernellist self.kernellist = kernellist
self.installtree = installtree self.installtree = installtree
@ -368,6 +370,8 @@ class X86(object):
self.version = version self.version = version
self.treeinfo = treeinfo self.treeinfo = treeinfo
self.basearch = basearch self.basearch = basearch
self.ctype = ctype
self.cspeed = cspeed
self.kernels, self.initrds = [], [] self.kernels, self.initrds = [], []
self.reqs = collections.defaultdict(str) self.reqs = collections.defaultdict(str)
@ -508,7 +512,7 @@ class X86(object):
initrd.itype = kernel.ktype initrd.itype = kernel.ktype
logger.info("compressing the install tree") logger.info("compressing the install tree")
self.installtree.compress(initrd, kernel) self.installtree.compress(initrd, kernel, self.ctype, self.cspeed)
# add kernel and initrd to the list # add kernel and initrd to the list
self.kernels.append(kernel) self.kernels.append(kernel)
@ -582,7 +586,7 @@ class X86(object):
class S390(object): class S390(object):
def __init__(self, kernellist, installtree, outputroot, product, version, def __init__(self, kernellist, installtree, outputroot, product, version,
treeinfo, basearch): treeinfo, basearch, ctype, cspeed):
self.kernellist = kernellist self.kernellist = kernellist
self.installtree = installtree self.installtree = installtree
@ -591,6 +595,8 @@ class S390(object):
self.version = version self.version = version
self.treeinfo = treeinfo self.treeinfo = treeinfo
self.basearch = basearch self.basearch = basearch
self.ctype = ctype
self.cspeed = cspeed
self.kernels, self.initrds = [], [] self.kernels, self.initrds = [], []
self.reqs = collections.defaultdict(str) self.reqs = collections.defaultdict(str)
@ -630,7 +636,7 @@ class S390(object):
initrd.fpath = joinpaths(self.outputroot, IMAGESDIR, initrd.fname) initrd.fpath = joinpaths(self.outputroot, IMAGESDIR, initrd.fname)
logger.info("compressing the install tree") logger.info("compressing the install tree")
self.installtree.compress(initrd, kernel) self.installtree.compress(initrd, kernel, self.ctype, self.cspeed)
# run addrsize # run addrsize
addrsize = joinpaths(self.installtree.root, "usr/libexec", addrsize = joinpaths(self.installtree.root, "usr/libexec",
@ -679,7 +685,7 @@ class S390(object):
class SPARC(object): class SPARC(object):
def __init__(self, kernellist, installtree, outputroot, product, version, def __init__(self, kernellist, installtree, outputroot, product, version,
treeinfo, basearch): treeinfo, basearch, ctype, cspeed):
self.kernellist = kernellist self.kernellist = kernellist
self.installtree = installtree self.installtree = installtree
@ -688,6 +694,8 @@ class SPARC(object):
self.version = version self.version = version
self.treeinfo = treeinfo self.treeinfo = treeinfo
self.basearch = basearch self.basearch = basearch
self.ctype = ctype
self.cspeed = cspeed
self.kernels, self.initrds = [], [] self.kernels, self.initrds = [], []
self.reqs = collections.defaultdict(str) self.reqs = collections.defaultdict(str)
@ -736,7 +744,7 @@ class SPARC(object):
initrd.fpath = joinpaths(self.outputroot, SPARCDIR, initrd.fname) initrd.fpath = joinpaths(self.outputroot, SPARCDIR, initrd.fname)
logger.info("compressing the install tree") logger.info("compressing the install tree")
self.installtree.compress(initrd, kernel) self.installtree.compress(initrd, kernel, self.ctype, self.cspeed)
# add kernel and initrd to .treeinfo # add kernel and initrd to .treeinfo
kernel_arch = kernel.version.split(".")[-1] kernel_arch = kernel.version.split(".")[-1]

9
src/pylorax/installtree.py
View File

@ -504,7 +504,7 @@ class LoraxInstallTree(BaseLoraxClass):
dst = joinpaths(self.root, "sbin") dst = joinpaths(self.root, "sbin")
shutil.copy2(src, dst) shutil.copy2(src, dst)
def compress(self, initrd, kernel, type="xz"): def compress(self, initrd, kernel, type="xz", speed="9"):
chdir = lambda: os.chdir(self.root) chdir = lambda: os.chdir(self.root)
start = time.time() start = time.time()
@ -521,12 +521,7 @@ class LoraxInstallTree(BaseLoraxClass):
stdin=find.stdout, stdout=subprocess.PIPE, stdin=find.stdout, stdout=subprocess.PIPE,
preexec_fn=chdir) preexec_fn=chdir)
if type == "gzip": compressed = subprocess.Popen([type, "-%s" % speed], stdin=cpio.stdout,
cmd = [self.lcmds.GZIP, "-9"]
elif type == "xz":
cmd = [self.lcmds.XZ, "-9"]
compressed = subprocess.Popen(cmd, stdin=cpio.stdout,
stdout=open(initrd.fpath, "wb")) stdout=open(initrd.fpath, "wb"))
logger.debug("compressing") logger.debug("compressing")