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

mkksiso: Add the option to set the ISO volume label

Browse Source 
To distinguish from the base images, a different
volume label is useful.
Add a commandline option, pass it to the iso tool,
and replace the occurences of the label in isolinux
and grub config files.

Signed-off-by: Brian C. Lane <bcl@redhat.com>
This commit is contained in:
Florian Achleitner 2019-12-03 16:26:30 +01:00 committed by Brian C. Lane
parent 10473f59e9
commit e82ae6b82a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sbin/mkksiso
View File

@ -368,7 +368,7 @@ MkisofsTools = [Mkisofs_aarch64, Mkisofs_ppc, Mkisofs_ppc64le, Mkisofs_s390, Mki
class MakeKickstartISO(): class MakeKickstartISO():
def __init__(self, ks, input_iso, output_iso, add_paths, cmdline=""): def __init__(self, ks, input_iso, output_iso, add_paths, cmdline="", volid=None):
self.ks = ks self.ks = ks
self.input_iso = input_iso self.input_iso = input_iso
self.output_iso = output_iso self.output_iso = output_iso
@ -393,7 +393,7 @@ class MakeKickstartISO():
# Mount the iso so we can gather information from it # Mount the iso so we can gather information from it
try: try:
self.iso = IsoMountpoint(self.input_iso) self.iso = IsoMountpoint(self.input_iso)
self.label = self.iso.label self.label = self.iso.label if volid is None else volid
log.info("Volume Id = %s", self.label) log.info("Volume Id = %s", self.label)
if os.path.exists(os.path.join(self.iso.mount_dir, "images/efiboot.img")): if os.path.exists(os.path.join(self.iso.mount_dir, "images/efiboot.img")):
@ -469,7 +469,10 @@ class MakeKickstartISO():
# Edit the config file # Edit the config file
with open(orig_cfg, "r") as in_fp: with open(orig_cfg, "r") as in_fp:
with open(os.path.join(tmpdir, "isolinux/isolinux.cfg"), "w") as out_fp: with open(os.path.join(tmpdir, "isolinux/isolinux.cfg"), "w") as out_fp:
escaped_iso_label = udev_escape(self.iso.label)
for line in in_fp: for line in in_fp:
if escaped_iso_label in line:
line = line.replace(escaped_iso_label, self.escaped_label)
out_fp.write(line.rstrip("\n")) out_fp.write(line.rstrip("\n"))
if "append" in line: if "append" in line:
out_fp.write(" "+self.add_args) out_fp.write(" "+self.add_args)
@ -493,7 +496,12 @@ class MakeKickstartISO():
dest_cfg = os.path.join(tmpdir, cfg) dest_cfg = os.path.join(tmpdir, cfg)
with open(orig_cfg, "r") as in_fp: with open(orig_cfg, "r") as in_fp:
with open(dest_cfg, "w") as out_fp: with open(dest_cfg, "w") as out_fp:
escaped_iso_label = udev_escape(self.iso.label)
for line in in_fp: for line in in_fp:
if escaped_iso_label in line:
line = line.replace(escaped_iso_label, self.escaped_label)
if line.strip().startswith("search"):
line = line.replace(self.iso.label, self.label)
out_fp.write(line.rstrip("\n")) out_fp.write(line.rstrip("\n"))
# Some start with linux (aarch64), others with linuxefi (x86_64) # Some start with linux (aarch64), others with linuxefi (x86_64)
if line.strip().startswith("linux"): if line.strip().startswith("linux"):
@ -514,7 +522,10 @@ class MakeKickstartISO():
# Edit the config file # Edit the config file
with open(orig_cfg, "r") as in_fp: with open(orig_cfg, "r") as in_fp:
with open(os.path.join(tmpdir, "boot/grub/grub.cfg"), "w") as out_fp: with open(os.path.join(tmpdir, "boot/grub/grub.cfg"), "w") as out_fp:
escaped_iso_label = udev_escape(self.iso.label)
for line in in_fp: for line in in_fp:
if escaped_iso_label in line:
line = line.replace(escaped_iso_label, self.escaped_label)
out_fp.write(line.rstrip("\n")) out_fp.write(line.rstrip("\n"))
if line.strip().startswith("linux "): if line.strip().startswith("linux "):
out_fp.write(" "+self.add_args) out_fp.write(" "+self.add_args)
@ -582,6 +593,7 @@ def setup_args():
parser.add_argument("ks", type=os.path.abspath, help="Kickstart to add to the ISO") parser.add_argument("ks", type=os.path.abspath, help="Kickstart to add to the ISO")
parser.add_argument("input_iso", type=os.path.abspath, help="ISO to modify") parser.add_argument("input_iso", type=os.path.abspath, help="ISO to modify")
parser.add_argument("output_iso", type=os.path.abspath, help="Full pathname of iso to be created") parser.add_argument("output_iso", type=os.path.abspath, help="Full pathname of iso to be created")
parser.add_argument("-V", "--volid", dest="volid", help="Set the ISO volume id, defaults to input's", default=None)
args = parser.parse_args() args = parser.parse_args()
return args return args
@ -597,7 +609,7 @@ def main():
try: try:
app = MakeKickstartISO(args.ks, args.input_iso, args.output_iso, app = MakeKickstartISO(args.ks, args.input_iso, args.output_iso,
args.add_paths, args.cmdline) args.add_paths, args.cmdline, args.volid)
app.run() app.run()
except RuntimeError as e: except RuntimeError as e:
log.error(str(e)) log.error(str(e))