From 045caadff965b5e7eecef8a528570c94df2e54c8 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 18 Nov 2021 12:12:55 -0500 Subject: [PATCH] Add ubuntu scheme to boot assets in imgutil This brings us to the redhat, suse, and ubuntu schemes being understood. --- imgutil/imgutil | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/imgutil/imgutil b/imgutil/imgutil index 047e5837..62d4f68d 100644 --- a/imgutil/imgutil +++ b/imgutil/imgutil @@ -1122,6 +1122,8 @@ def pack_image(args): initrdname = os.path.join(args.scratchdir, 'boot/initramfs-{0}.img'.format(mostrecent)) if not os.path.exists(initrdname): initrdname = os.path.join(args.scratchdir, 'boot/initrd-{0}'.format(mostrecent)) + if not os.path.exists(initrdname): + initrdname = os.path.join(args.scratchdir, 'boot/initrd.img-{0}'.format(mostrecent)) oum = os.umask(0o077) for path in ('/var/lib/confluent', '/var/lib/confluent/private', '/var/lib/confluent/private/os'): if not os.path.exists(path): @@ -1192,6 +1194,8 @@ def gather_bootloader(outdir, rootpath='/'): shimlocation = os.path.join(rootpath, 'boot/efi/EFI/BOOT/BOOTX64.EFI') if not os.path.exists(shimlocation): shimlocation = os.path.join(rootpath, 'usr/lib64/efi/shim.efi') + if not os.path.exists(shimlocation): + shimlocation = os.path.join(rootpath, 'usr/lib/shim/shimx64.efi.signed') mkdirp(os.path.join(outdir, 'boot/efi/boot')) shutil.copyfile(shimlocation, os.path.join(outdir, 'boot/efi/boot/BOOTX64.EFI')) grubbin = None @@ -1201,6 +1205,8 @@ def gather_bootloader(outdir, rootpath='/'): break if not grubbin: grubbin = os.path.join(rootpath, 'usr/lib64/efi/grub.efi') + if not os.path.exists(grubbin): + grubbin = os.path.join(rootpath, 'usr/lib/grub/x86_64-efi/monolithic/grubx64.efi') shutil.copyfile(grubbin, os.path.join(outdir, 'boot/efi/boot/grubx64.efi')) shutil.copyfile(grubbin, os.path.join(outdir, 'boot/efi/boot/grub.efi'))