From 8a2f9ed0dfeb916985d2ecad51e9fb7626a8399c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Aug 09 2023 09:42:11 +0000
Subject: components: Add grub packages for ISO type and set liveinstall for ISOs only


Without the grub packages for ISO type, we cannot boot via UEFI.

Additionally, package installs for liveinstall do not make sense
for anything else other than ISO type images, so declare them as such.

---

diff --git a/components/boot.xml b/components/boot.xml
index 508dd05..f2352a5 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -15,4 +15,8 @@
 		<package name="systemd-oomd-defaults"/>
 		<package name="systemd-resolved"/>
 	</packages>
+	<packages type="iso" patternType="plusRecommended" profiles="BootCore">
+		<package name="grub2-efi-aa64-cdboot" arch="aarch64"/>
+		<package name="grub2-efi-x64-cdboot" arch="x86_64"/>
+	</packages>
 </image>
diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index 1aec369..5f669e8 100644
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@@ -9,7 +9,7 @@
 			<bootloader name="grub2" grub_template="grub.cfg.iso-template" console="console" timeout="60"/>
 		</type>
 	</preferences>
-	<packages type="image" patternType="plusRecommended" profiles="LiveInstall">
+	<packages type="iso" patternType="plusRecommended" profiles="LiveInstall">
 		<!-- The point of a live image is to install -->
 		<namedCollection name="anaconda-tools"/>
 		<package name="anaconda"/>