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

Fix passing of prepboot and macboot arguments

Browse Source
This commit is contained in:
Martin Gracik 2011-03-14 13:14:26 +01:00
parent ab515eff64
commit fdbf53227e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pylorax/images.py
View File

@ -244,7 +244,7 @@ class PPC(object):
if (bits == 32): if (bits == 32):
# set up prepboot # set up prepboot
p = joinpaths(NETBOOTDIR, ppc_img_fname) p = joinpaths(NETBOOTDIR, ppc_img_fname)
prepboot = "-prep-boot {0}".format(p) prepboot = ["-prep-boot {0}".format(p)]
# remove netboot dir if empty # remove netboot dir if empty
try: try:
@ -271,7 +271,8 @@ class PPC(object):
# set up macboot # set up macboot
p = joinpaths(self.outputroot, ISOPATHDIR, MACDIR) p = joinpaths(self.outputroot, ISOPATHDIR, MACDIR)
macboot = "-hfs-volid {0} -hfs-bless {1}".format(self.version, p) macboot = ["-hfs-volid {0}".format(self.version),
"-hfs-bless {0}".format(p)]
# add note to yaboot # add note to yaboot
cmd = [joinpaths(self.installtree.root, "usr/lib/yaboot/addnote"), cmd = [joinpaths(self.installtree.root, "usr/lib/yaboot/addnote"),
@ -315,19 +316,20 @@ class PPC(object):
joinpaths(imagesdir, os.path.basename(NETBOOTDIR))) joinpaths(imagesdir, os.path.basename(NETBOOTDIR)))
# define prepboot and macboot # define prepboot and macboot
prepboot = "" if "prepboot" not in locals() else locals()["prepboot"] prepboot = [] if "prepboot" not in locals() else locals()["prepboot"]
macboot = "" if "macboot" not in locals() else locals()["macboot"] macboot = [] if "macboot" not in locals() else locals()["macboot"]
# create boot image # create boot image
boot_fpath = joinpaths(self.outputroot, IMAGESDIR, "boot.iso") boot_fpath = joinpaths(self.outputroot, IMAGESDIR, "boot.iso")
# run mkisofs # run mkisofs
cmd = [MKISOFS, "-o", boot_fpath, "-chrp-boot", "-U", prepboot, cmd = [MKISOFS, "-o", boot_fpath, "-chrp-boot", "-U"] + prepboot + \
"-part", "-hfs", "-T", "-r", "-l", "-J", "-A", ["-part", "-hfs", "-T", "-r", "-l", "-J", "-A",
'"%s %s"' % (self.product, self.version), '"%s %s"' % (self.product, self.version),
"-sysid", "PPC", "-V", '"PBOOT"', "-sysid", "PPC", "-V", '"PBOOT"',
"-volset", '"%s"' % self.version, "-volset-size", "1", "-volset", '"%s"' % self.version, "-volset-size", "1",
"-volset-seqno", "1", macboot, "-map", MAPPING, "-magic", MAGIC, "-volset-seqno", "1"] + macboot + \
["-map", MAPPING, "-magic", MAGIC,
"-no-desktop", "-allow-multidot", "-graft-points", isopathdir] "-no-desktop", "-allow-multidot", "-graft-points", isopathdir]
logger.debug("running: %s" % cmd) logger.debug("running: %s" % cmd)