Merge pull request #227 from grml/mika/ia32

Support UEFI 32bit boot on amd64
grml · Dec 19, 2024 · 8520a72 · 8520a72
2 parents 6486c84 + fdba3b2
commit 8520a72
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 4 deletions.
diff --git a/etc/grml/fai/config/package_config/DEBIAN_TESTING b/etc/grml/fai/config/package_config/DEBIAN_TESTING
@@ -12,3 +12,8 @@ dhcpcd-base
 # Required for ping to work in trixie and newer.
 # https://github.com/grml/grml-live/issues/160
 linux-sysctl-defaults
+
+
+PACKAGES install AMD64
+# UEFI 32bit boot support, available in Debian/trixie and newer
+grub-efi-ia32-unsigned
diff --git a/etc/grml/fai/config/package_config/DEBIAN_TRIXIE b/etc/grml/fai/config/package_config/DEBIAN_TRIXIE
@@ -12,3 +12,8 @@ dhcpcd-base
 # Required for ping to work in trixie and newer.
 # https://github.com/grml/grml-live/issues/160
 linux-sysctl-defaults
+
+
+PACKAGES install AMD64
+# UEFI 32bit boot support, available in Debian/trixie and newer
+grub-efi-ia32-unsigned
diff --git a/etc/grml/fai/config/package_config/DEBIAN_UNSTABLE b/etc/grml/fai/config/package_config/DEBIAN_UNSTABLE
@@ -12,3 +12,8 @@ dhcpcd-base
 # Required for ping to work in trixie and newer.
 # https://github.com/grml/grml-live/issues/160
 linux-sysctl-defaults
+
+
+PACKAGES install AMD64
+# UEFI 32bit boot support, available in Debian/trixie and newer
+grub-efi-ia32-unsigned
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images b/etc/grml/fai/config/scripts/GRMLBASE/45-grub-images
@@ -54,7 +54,8 @@ if ifclass AMD64 ; then
   fi
 fi
 
-if ifclass I386 ; then
+# note: enabled also on AMD64 for UEFI 32bit boot support
+if ifclass I386 || ifclass AMD64 ; then
   if [ -r "${target}"/usr/lib/grub/i386-efi/moddep.lst ] ; then
     ARCHS+=(i386-efi)
     ADDITIONAL_MODULES[i386-efi]="efi_gop efi_uga"

diff --git a/grml-live b/grml-live
@@ -973,6 +973,7 @@ grub_setup() {
         ;;
       amd64)
         BOOTX64="/boot/bootx64.efi"
+        BOOTX32="/boot/bootia32.efi"
         ;;
     esac
 
@@ -985,6 +986,15 @@ grub_setup() {
       bailout 50
     fi
 
+    # UEFI 32bit boot support, only supported with Debian trixie and newer,
+    # so make it optional and don't fail hard
+    if [[ "$ARCH" == "amd64" ]] && ! [ -r "${CHROOT_OUTPUT}/${BOOTX32}" ] ; then
+      local uefi_32bit_support
+      uefi_32bit_support=0
+      log   "Cannot access GRUB 32-bit PC EFI image ${CHROOT_OUTPUT}/${BOOTX32}, disabling UEFI 32bit boot support."
+      ewarn "Cannot access GRUB 32-bit PC EFI image ${CHROOT_OUTPUT}/${BOOTX32}, disabling UEFI 32bit boot support" ; eend 0
+    fi
+
     dd if=/dev/zero of="${CHROOT_OUTPUT}/${EFI_IMG}" bs="${efi_size}" count=1 2>/dev/null || bailout 50
     mkfs.vfat -n GRML "${CHROOT_OUTPUT}/${EFI_IMG}" >/dev/null || bailout 51
     mmd -i "${CHROOT_OUTPUT}/${EFI_IMG}" ::EFI || bailout 52
@@ -994,18 +1004,23 @@ grub_setup() {
       log   "Secure Boot is disabled."
       einfo "Secure Boot is disabled." ; eend 0
 
-      # install "$BOOTX64" as ::EFI/BOOT/{bootx64.efi|bootaa64.efi} inside image file "$EFI_IMG":
+      # install "$BOOTX64" as ::EFI/BOOT/{bootx64.efi|bootaa64.efi} inside image file "$EFI_IMG",
+      # and if present also "$BOOTX32" as ::EFI/BOOT/bootia32.efi on amd64 for UEFI 32bit boot support:
       case "$ARCH" in
         arm64)
           mcopy -i "${CHROOT_OUTPUT}/${EFI_IMG}" "${CHROOT_OUTPUT}/${BOOTX64}" ::EFI/BOOT/bootaa64.efi >/dev/null || bailout 53
           ;;
         amd64)
           mcopy -i "${CHROOT_OUTPUT}/${EFI_IMG}" "${CHROOT_OUTPUT}/${BOOTX64}" ::EFI/BOOT/bootx64.efi >/dev/null || bailout 53
+          # UEFI 32bit boot
+          if [ "${uefi_32bit_support:-}" != "0" ] ; then
+            mcopy -i "${CHROOT_OUTPUT}/${EFI_IMG}" "${CHROOT_OUTPUT}/${BOOTX32}" ::EFI/BOOT/bootia32.efi >/dev/null || bailout 53
+          fi
           ;;
       esac
 
-      log   "Created UEFI image $EFI_IMG from $BOOTX64"
-      einfo "Created UEFI image $EFI_IMG from $BOOTX64" ; eend 0
+      log   "Created UEFI image $EFI_IMG from $BOOTX64 ${BOOTX32:-}"
+      einfo "Created UEFI image $EFI_IMG from $BOOTX64 ${BOOTX32:-}" ; eend 0
     else
       case "${SECURE_BOOT}" in
         disable*)
@@ -1812,6 +1827,15 @@ create_netbootpackage() {
           log   "No grubnetx64.efi for usage with PXE boot found (grub-efi-amd64-signed not present?)"
           ewarn "No grubnetx64.efi for usage with PXE boot found (grub-efi-amd64-signed not present?)." ; eend 0
         fi
+
+        # UEFI 32bit boot
+        if ! copy_optional_file_logged "${WORKING_DIR}"/grubia32.efi "${CHROOT_OUTPUT}" \
+          /usr/lib/grub/i386-efi-signed/grubnetia32.efi.signed \
+          /usr/lib/grub/i386-efi/monolithic/grubnetia32.efi
+        then
+          log   "No grubnetia32.efi for usage with PXE boot found (grub-efi-ia32-unsigned present?)"
+          ewarn "No grubnetia32.efi for usage with PXE boot found (grub-efi-ia32-unsigned present?)." ; eend 0
+        fi
       fi
 
       if [ "$ARCH" = "arm64" ] ; then