Check if the volume id is not longer than 32 chars (#786832)
This is a requirement of mkisofs. Try to check it as soon as possible.
This commit is contained in:
parent
20fa29b32b
commit
524dfa28db
@ -181,6 +181,15 @@ class Lorax(BaseLoraxClass):
|
|||||||
self.product = product
|
self.product = product
|
||||||
logger.debug("product data: %s" % product)
|
logger.debug("product data: %s" % product)
|
||||||
|
|
||||||
|
# NOTE: if you change isolabel, you need to change pungi to match, or
|
||||||
|
# the pungi images won't boot.
|
||||||
|
isolabel = volid or "{0.name} {0.version} {1.basearch}".format(self.product,
|
||||||
|
self.arch)
|
||||||
|
|
||||||
|
if len(isolabel) > 32:
|
||||||
|
logger.fatal("the volume id cannot be longer than 32 characters")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
templatedir = self.conf.get("lorax", "sharedir")
|
templatedir = self.conf.get("lorax", "sharedir")
|
||||||
# NOTE: rb.root = ybo.conf.installroot (== self.inroot)
|
# NOTE: rb.root = ybo.conf.installroot (== self.inroot)
|
||||||
rb = RuntimeBuilder(product=self.product, arch=self.arch,
|
rb = RuntimeBuilder(product=self.product, arch=self.arch,
|
||||||
@ -235,8 +244,8 @@ class Lorax(BaseLoraxClass):
|
|||||||
logger.info("preparing to build output tree and boot images")
|
logger.info("preparing to build output tree and boot images")
|
||||||
treebuilder = TreeBuilder(product=self.product, arch=self.arch,
|
treebuilder = TreeBuilder(product=self.product, arch=self.arch,
|
||||||
inroot=installroot, outroot=self.outputdir,
|
inroot=installroot, outroot=self.outputdir,
|
||||||
runtime=runtime, templatedir=templatedir,
|
runtime=runtime, isolabel=isolabel,
|
||||||
volid=volid)
|
templatedir=templatedir)
|
||||||
|
|
||||||
logger.info("rebuilding initramfs images")
|
logger.info("rebuilding initramfs images")
|
||||||
dracut_args=["--xz", "--add", "livenet", "--add", "convertfs", "--omit", "plymouth"]
|
dracut_args=["--xz", "--add", "livenet", "--add", "convertfs", "--omit", "plymouth"]
|
||||||
|
@ -151,11 +151,7 @@ class RuntimeBuilder(object):
|
|||||||
class TreeBuilder(object):
|
class TreeBuilder(object):
|
||||||
'''Builds the arch-specific boot images.
|
'''Builds the arch-specific boot images.
|
||||||
inroot should be the installtree root (the newly-built runtime dir)'''
|
inroot should be the installtree root (the newly-built runtime dir)'''
|
||||||
def __init__(self, product, arch, inroot, outroot, runtime, templatedir=None, volid=None):
|
def __init__(self, product, arch, inroot, outroot, runtime, isolabel, templatedir=None):
|
||||||
# NOTE: if you change isolabel, you need to change pungi to match, or
|
|
||||||
# the pungi images won't boot.
|
|
||||||
isolabel = volid or "{0.name} {0.version} {1.basearch}".format(product, arch)
|
|
||||||
|
|
||||||
# NOTE: if you pass an arg named "runtime" to a mako template it'll
|
# NOTE: if you pass an arg named "runtime" to a mako template it'll
|
||||||
# clobber some mako internal variables - hence "runtime_img".
|
# clobber some mako internal variables - hence "runtime_img".
|
||||||
self.vars = DataHolder(arch=arch, product=product, runtime_img=runtime,
|
self.vars = DataHolder(arch=arch, product=product, runtime_img=runtime,
|
||||||
|
Loading…
Reference in New Issue
Block a user