From 7f98cfbcf73fbb5b0e57251f7869151a3df1fd96 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 22 Feb 2022 10:13:07 +1100
Subject: [PATCH] bootloader: clean up EFI checking

The check removed here came in with
I4481b43e4a8fe4144be9c7eb9d9c618bbb2df21e a long time ago.  At that
time we were not building EFI images, and were building i386 images;
both of which are now untrue.

We can simplify this now by merging it into the gpt/mbr path.  If we
are in there we know that we should set --target=i386-pc for BIOS
boot.  For sanity check that we are x86 in this path -- PPC is handled
separately (although it's probably bit-rotted) and ARM64 is EFI.

Change-Id: Ie9839c9adc642b0dd688bced3faa46e9314e9799
Co-Authored-By: Clark Boylan <clark.boylan@gmail.com>
---
 .../bootloader/finalise.d/50-bootloader       | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
index 3876e9a8..361366c2 100755
--- a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
+++ b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
@@ -87,22 +87,6 @@ fi
 # root partition of a block device.
 GRUB_OPTS="--force "
 
-# /sys/ comes from the host machine. If the host machine is using EFI
-# but the image being built doesn't have EFI boot-images installed we
-# should set the --target to use a BIOS-based boot-image.
-#
-# * --target tells grub what's the target platform
-# * the boot images are placed in /usr/lib/grub/<cpu>-<platform>
-# * i386-pc is used for BIOS-based machines
-#   http://www.gnu.org/software/grub/manual/grub.html#Installation
-# * this check is only valid for x86_64; other platforms we support
-#   are either not EFI (ppc) or always EFI (arm64)
-if [[ "x86_64 amd64" =~ ${ARCH} ]]; then
-    if [[ -d /sys/firmware/efi && ! -d /usr/lib/grub/x86_64-efi ]]; then
-        GRUB_OPTS="$GRUB_OPTS --target=i386-pc"
-    fi
-fi
-
 if [[ "$ARCH" =~ "ppc" ]] ; then
     # For PPC (64-Bit regardless of Endian-ness), we use the "boot"
     # partition as the one to point grub-install to, not the loopback
@@ -113,8 +97,13 @@ if [[ "$ARCH" =~ "ppc" ]] ; then
 else
     # This set of modules is sufficient for all installs (mbr/gpt/efi)
     modules="part_msdos part_gpt lvm"
+
     if [[ ${DIB_BLOCK_DEVICE} == "mbr" || ${DIB_BLOCK_DEVICE} == "gpt" ]]; then
-        $GRUBNAME --modules="$modules biosdisk" $GRUB_OPTS $BOOT_DEV
+        if [[ ! "x86_64 amd64" =~ ${ARCH} ]]; then
+            echo "*** ${ARCH} is not supported by mbr/gpt"
+        fi
+        $GRUBNAME --modules="$modules biosdisk" --target=i386-pc \
+                $GRUB_OPTS $BOOT_DEV
     elif [[ ${DIB_BLOCK_DEVICE} == "efi" ]]; then
         # We need to manually set the target if it's different to
         # the host.  Setup for EFI