openstack/diskimage-builder
Code Issues Proposed changes

Force grub2-install to bypass secureboot complaints.

Browse Source 
GRUB_OPTS is already set to --force by default and is being overriden
to the x86_64 target for those architectures. It would be more effective
to append this target to the options instead of overriding it.

In EL9 images, grub2-install will not proceed as it complains about
not supporting secure boot. This isn't appropriate for the way that
diskimage-builder works, and thus --force is needed to bypass this.

Closes-Bug: 1930878
Change-Id: I989bd009548adc7bbf58154577c24980bd62cb2d
This commit is contained in:
Gwen Dawes 2024-12-10 15:55:57 +00:00
parent bec3a6e3a1
commit 8874befa3a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,9 +329,9 @@ else
# This call installs grub for BIOS compatability
# which makes portable EFI/BIOS images.
$GRUBNAME --modules="$modules" --target=i386-pc $BOOT_DEV
# Set the x86_64 specific efi target for the generic
# Append the x86_64 specific efi target for the generic
# installation below.
GRUB_OPTS="--target=x86_64-efi"
GRUB_OPTS="${GRUB_OPTS} --target=x86_64-efi"
;;
# At this point, we don't need to override the target
# for any other architectures.