From 31f9f8a7437ffe6cb5a9a761dfac62949f8b07ff Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Mon, 4 Mar 2024 21:25:39 -0500
Subject: [PATCH] components/boot: Force grubby at bootstrap phase

If no preference is expressed, sdubby will be selected instead of
grubby, which breaks image builds. Thus, install grubby early to
avoid this issue.
---
 components/boot.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/boot.xml b/components/boot.xml
index fb313fb..a42d469 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -3,6 +3,9 @@
 		<profile name="BootCore" description="Boot core packages"/>
 		<profile name="BootCoreUKI" description="Boot core packages for UKI"/>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore,BootCoreUKI">
+		<package name="grubby"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootCore">
 		<package name="grub2-efi-aa64" arch="aarch64"/>
 		<package name="grub2-efi-aa64-modules" arch="aarch64"/>
@@ -11,7 +14,6 @@
 		<package name="grub2-pc" arch="x86_64"/>
 		<package name="grub2-pc-modules" arch="x86_64"/>
 		<package name="grub2-ppc64le" arch="ppc64le"/>
-		<package name="grubby"/>
 		<package name="shim-signed-aa64" arch="aarch64"/>
 		<package name="shim-signed-x64" arch="x86_64"/>
 		<package name="kernel-core"/>