From 88a71cb8cae21913e07acbdf560adfbd9b500804 Mon Sep 17 00:00:00 2001 From: Greg Darke Date: Thu, 19 May 2022 15:57:54 +1000 Subject: [PATCH] multiboot: Support booting arch with non-default kernels. This only works if there is a single kernel in the iso file. While we are here, also load the microkernel updates (for amd and intel) if the files exist in the image (which they do by default). --- hacks/multiboot-setup | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hacks/multiboot-setup b/hacks/multiboot-setup index 0ea027c..8abc2be 100755 --- a/hacks/multiboot-setup +++ b/hacks/multiboot-setup @@ -112,8 +112,10 @@ search --set=root --label $PARTITION_LABEL function setup_arch { menuentry "\$1" { loopback loop \$1 - linux (loop)/arch/boot/x86_64/vmlinuz-linux img_label=${PARTITION_LABEL} img_loop=\$1 archisobasedir=arch earlymodules=loop - initrd (loop)/arch/boot/x86_64/initramfs-linux.img + echo "Loading kernel..." + linux (loop)/arch/boot/x86_64/vmlinuz-* img_label=${PARTITION_LABEL} img_loop=\$1 archisobasedir=arch earlymodules=loop + echo "Loading initrd (and microcode if they exist)..." + initrd (loop)/arch/boot/*.img (loop)/arch/boot/x86_64/initramfs-*.img } } for iso in /archlinux-*.iso; do -- 2.39.2