From 8def7fc8f0fc126d8af75c0ef677d27202c3f613 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 11 Mar 2026 09:00:32 -0700
Subject: [PATCH] Revert "Drop all installs of shim-ia32 (it no longer exists)"

This reverts commit 7131f27c5b9989ed1d412d0d59d5a9ad4314a142.

shim-ia32 is being built again, there are reports of hardware that needs
it in order too boot. See
https://bugzilla.redhat.com/show_bug.cgi?id=2391723#c10 for more
details.

Related: rhbz#2391723
---
 docs/fedora-livemedia.ks                            | 1 +
 share/templates.d/99-generic/efi.tmpl               | 3 ---
 share/templates.d/99-generic/live/efi.tmpl          | 3 ---
 share/templates.d/99-generic/live/live-install.tmpl | 2 +-
 share/templates.d/99-generic/runtime-install.tmpl   | 1 +
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks
index 5ea410793..9b779cb44 100644
--- a/docs/fedora-livemedia.ks
+++ b/docs/fedora-livemedia.ks
@@ -89,6 +89,7 @@ case $ARCH in
         echo "%packages" >> $PKGS
         echo "@^workstation-product-environment" >> $PKGS
         echo "shim" >> $PKGS
+        echo "shim-ia32" >> $PKGS
         echo "grub2" >> $PKGS
         echo "grub2-efi" >> $PKGS
         echo "grub2-efi-ia32" >> $PKGS
diff --git a/share/templates.d/99-generic/efi.tmpl b/share/templates.d/99-generic/efi.tmpl
index dea009435..d50c57503 100644
--- a/share/templates.d/99-generic/efi.tmpl
+++ b/share/templates.d/99-generic/efi.tmpl
@@ -13,11 +13,8 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
 install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
 %endif
 %if efiarch32:
-## shim-ia32 is gone in F44+, other ia32 bits remain for now
-%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"):
 install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI
 install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/
-%endif
 install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi
 %endif
 install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/
diff --git a/share/templates.d/99-generic/live/efi.tmpl b/share/templates.d/99-generic/live/efi.tmpl
index f847ed9f4..f1fd1b51f 100644
--- a/share/templates.d/99-generic/live/efi.tmpl
+++ b/share/templates.d/99-generic/live/efi.tmpl
@@ -13,11 +13,8 @@ install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
 install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
 %endif
 %if efiarch32:
-## shim-ia32 is gone in F44+, other ia32 bits remain for now
-%if exists("boot/efi/EFI/*/shim${efiarch32|lower}.efi"):
 install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI
 install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/
-%endif
 install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi
 %endif
 install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/
diff --git a/share/templates.d/99-generic/live/live-install.tmpl b/share/templates.d/99-generic/live/live-install.tmpl
index 61dc5653a..ef514ee80 100644
--- a/share/templates.d/99-generic/live/live-install.tmpl
+++ b/share/templates.d/99-generic/live/live-install.tmpl
@@ -10,7 +10,7 @@
     installpkg grub2-tools-efi
     installpkg efibootmgr
     installpkg shim-x64 grub2-efi-x64-cdboot
-    installpkg grub2-efi-ia32-cdboot
+    installpkg shim-ia32 grub2-efi-ia32-cdboot
     installpkg biosdevname
     installpkg grub2-tools grub2-tools-minimal grub2-tools-extra
     installpkg grub2-pc-modules
diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
index 282125309..eee697e45 100644
--- a/share/templates.d/99-generic/runtime-install.tmpl
+++ b/share/templates.d/99-generic/runtime-install.tmpl
@@ -72,6 +72,7 @@ installpkg glibc-all-langpacks
     installpkg efibootmgr
     installpkg shim-x64
     installpkg grub2-efi-x64-cdboot>=${GRUB2VER}
+    installpkg shim-ia32
     installpkg grub2-efi-ia32-cdboot>=${GRUB2VER}
     installpkg biosdevname
     installpkg grub2-tools>=${GRUB2VER} grub2-tools-minimal>=${GRUB2VER}