openstack/diskimage-builder
Code Issues Proposed changes

Overwrite EFI grub.cfg when it exists

Browse Source 
Currently a partition image with existing EFI assets may produce an
invalid image because the EFI grub.cfg may reference a partition UUIDs
that don't exist in the partition image case.

This change replaces the EFI grub.cfg if the EFI directory exists at
all, ensuring the EFI grub.cfg is valid in more cases.

Also, add missing EFI_BOOT_DIR for fedora-container element.

Change-Id: Id4f8cd2cb16bbb1a392f531cf5b8455f81162c42
This commit is contained in:
Steve Baker 2024-04-17 10:36:03 +12:00
parent e075445d64
commit c03e46d9e1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
diskimage_builder/elements/bootloader/finalise.d/50-bootloader
View File

@ -207,16 +207,16 @@ fi
# linuxefi/initrdefi for the image to boot under efi
if [[ ${DIB_BLOCK_DEVICE} == "efi" ]]; then
sed -i 's%\(linux\|initrd\)16 /boot%\1efi /boot%g' $GRUB_CFG
fi
# Finally copy the grub.cfg and grubenv to the EFI specific dir
# to support functionality like secure boot. We make a copy because
# /boot and /boot/efi may be different partitions and uefi looks
# for a specific partition UUID preventing symlinks from working.
if [ -d /boot/efi/$EFI_BOOT_DIR ] ; then
cp $GRUB_CFG /boot/efi/$EFI_BOOT_DIR/grub.cfg
if [ -a $GRUBENV ]; then
cp $GRUBENV /boot/efi/$EFI_BOOT_DIR/grubenv
fi
# Finally copy the grub.cfg and grubenv to the EFI specific dir
# to support functionality like secure boot. We make a copy because
# /boot and /boot/efi may be different partitions and uefi looks
# for a specific partition UUID preventing symlinks from working.
if [ -n "${EFI_BOOT_DIR:-}" ] && [ -d /boot/efi/$EFI_BOOT_DIR ] ; then
cp $GRUB_CFG /boot/efi/$EFI_BOOT_DIR/grub.cfg
if [ -a $GRUBENV ]; then
cp $GRUBENV /boot/efi/$EFI_BOOT_DIR/grubenv
fi
fi

1
diskimage_builder/elements/fedora-container/environment.d/10-01-fedora-distro-name.bash
View File

@ -1,2 +1,3 @@
export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-34}
export EFI_BOOT_DIR="EFI/fedora"