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

Small ppc fixes

Browse Source
This commit is contained in:
Martin Gracik 2011-03-14 09:37:27 +01:00
parent 201116ac31
commit ab515eff64
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pylorax/images.py
View File

@ -264,7 +264,7 @@ class PPC(object):
yaboot = cpfile(self.reqs["yaboot"], yaboot = cpfile(self.reqs["yaboot"],
joinpaths(self.outputroot, CHRPDIR)) joinpaths(self.outputroot, CHRPDIR))
if (os.paths.exists(joinpaths(self.outputroot, MACDIR))): if (os.path.exists(joinpaths(self.outputroot, MACDIR))):
# copy yaboot and ofboot.b to mac dir # copy yaboot and ofboot.b to mac dir
cpfile(yaboot, joinpaths(self.outputroot, MACDIR)) cpfile(yaboot, joinpaths(self.outputroot, MACDIR))
cpfile(self.reqs["ofboot_b"], joinpaths(self.outputroot, MACDIR)) cpfile(self.reqs["ofboot_b"], joinpaths(self.outputroot, MACDIR))
@ -300,8 +300,10 @@ class PPC(object):
os.makedirs(isopathdir) os.makedirs(isopathdir)
# copy etc dir and ppc dir to isopath dir # copy etc dir and ppc dir to isopath dir
shutil.copytree(joinpaths(self.outputroot, ETCDIR), isopathdir) shutil.copytree(joinpaths(self.outputroot, ETCDIR),
shutil.copytree(joinpaths(self.outputroot, PPCPARENT), isopathdir) joinpaths(isopathdir, ETCDIR))
shutil.copytree(joinpaths(self.outputroot, PPCPARENT),
joinpaths(isopathdir, PPCPARENT))
if (os.path.exists(joinpaths(self.outputroot, NETBOOTDIR))): if (os.path.exists(joinpaths(self.outputroot, NETBOOTDIR))):
# create images dir in isopath dir if we have ppc images # create images dir in isopath dir if we have ppc images
@ -309,7 +311,8 @@ class PPC(object):
os.makedirs(imagesdir) os.makedirs(imagesdir)
# copy netboot dir to images dir # copy netboot dir to images dir
shutil.copytree(joinpaths(self.outputroot, NETBOOTDIR), imagesdir) shutil.copytree(joinpaths(self.outputroot, 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"]
@ -321,11 +324,14 @@ class PPC(object):
# 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"' % (product, version), "-sysid", "PPC", "-V", '"PBOOT"', '"%s %s"' % (self.product, self.version),
"-volset", '"%s"' % version, "-volset-size", "1", "-sysid", "PPC", "-V", '"PBOOT"',
"-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)
p = subprocess.Popen(cmd, stdin=subprocess.PIPE, p = subprocess.Popen(cmd, stdin=subprocess.PIPE,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
p.wait() p.wait()