Skip to content

build-efi-images: Make normal disk boot image search grub.cfg in boot image path first

Pascal Hambourg requested to merge pham/grub:bug1054373 into master

Commit 5171e04d ("Bundle unicode.pf2 in a squashfs memdisk attached to the signed EFI binary") removed the (memdisk)/grub.cfg from monolithic EFI normal disk boot images.

So now, the normal disk boot image only looks for grub.cfg in $prefix (=/EFI/$efi-vendor) and not in the boot image path ($cmdpath) any more. This breaks boot from the removable media path when installed with --removable and normal boot when installed with non-default --bootloader-id or GRUB_DISTRIBUTOR (!=$efi_vendor).

This patch embeds a new (memdisk)/grub.cfg file which looks for grub.cfg in the boot image path ($cmdpath) first so that it works with --removable and non-default --bootloader-id or GRUB_DISTRIBUTOR, then in $prefix so that it still boots properly from the removable media path when installed with --force-extra-removable until (hopefully) grub-install is patched to install grub.cfg into /EFI/Boot too, and installation/live images still boot properly until image builders are patched to install grub.cfg into /EFI/Boot instead of /EFI/debian.

Note: patching grub-install --force-extra-removable to also install grub.cfg in /EFI/Boot may also be required to boot properly from the removable media path when combined with non-default --bootloader-id or GRUB_DISTRIBUTOR.

Closes: #1054373

Edited by Pascal Hambourg

Merge request reports