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

livemedia-creator: Update make-pxe-live to support missing initramfs

Browse Source 
In some cases the initramfs may not be present in /boot to save space.
Use it if present, otherwise use the kernel version to recreate the name
of it.

This also fixes problems with dracut running out of space when not using
--live-rootfs-keep-size
This commit is contained in:
Brian C. Lane 2016-05-04 18:42:03 -07:00
parent 50b15d72b5
commit 2f66212c0f
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sbin/livemedia-creator
View File

@ -460,8 +460,7 @@ def rebuild_initrds_for_live(opts, sys_root_dir, results_dir):
if kernels_dir: if kernels_dir:
kdir = os.path.relpath(kernels_dir[0], sys_root_dir) kdir = os.path.relpath(kernels_dir[0], sys_root_dir)
kernels = [kernel for kernel in findkernels(sys_root_dir, kdir) kernels = [kernel for kernel in findkernels(sys_root_dir, kdir)]
if hasattr(kernel, "initrd")]
if not kernels: if not kernels:
raise Exception("No initrds found, cannot rebuild_initrds") raise Exception("No initrds found, cannot rebuild_initrds")
@ -483,20 +482,27 @@ def rebuild_initrds_for_live(opts, sys_root_dir, results_dir):
if not os.path.isdir(tmp_dir): if not os.path.isdir(tmp_dir):
os.mkdir(tmp_dir) os.mkdir(tmp_dir)
# Write the new initramfs directly to the results directory
os.mkdir(joinpaths(sys_root_dir, "results"))
mount(results_dir, opts="bind", mnt=joinpaths(sys_root_dir, "results"))
# Dracut runs out of space inside the minimal rootfs image
mount("/var/tmp", opts="bind", mnt=joinpaths(sys_root_dir, "var/tmp"))
for kernel in kernels: for kernel in kernels:
outfile = kernel.initrd.path + ".live" if hasattr(kernel, "initrd"):
outfile = os.path.basename(kernel.initrd.path)
else:
# Construct an initrd from the kernel name
outfile = os.path.basename(kernel.path.replace("vmlinuz-", "initrd-") + ".img")
log.info("rebuilding %s", outfile) log.info("rebuilding %s", outfile)
kver = kernel.version kver = kernel.version
cmd = dracut + [outfile, kver] cmd = dracut + ["/results/"+outfile, kver]
runcmd(cmd, root=sys_root_dir) runcmd(cmd, root=sys_root_dir)
new_initrd_path = joinpaths(results_dir, os.path.basename(kernel.initrd.path))
shutil.move(joinpaths(sys_root_dir, outfile), new_initrd_path)
os.chmod(new_initrd_path, 0o644)
shutil.copy2(joinpaths(sys_root_dir, kernel.path), results_dir) shutil.copy2(joinpaths(sys_root_dir, kernel.path), results_dir)
umount(joinpaths(sys_root_dir, "var/tmp"), delete=False)
umount(joinpaths(sys_root_dir, "results"), delete=False)
os.unlink(joinpaths(sys_root_dir,"/proc/modules")) os.unlink(joinpaths(sys_root_dir,"/proc/modules"))
def create_pxe_config(template, images_dir, live_image_name, add_args = None): def create_pxe_config(template, images_dir, live_image_name, add_args = None):