From 726d50088f8e42a94e4e11560266d10792b4e43d Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Mon, 8 Apr 2024 22:46:36 -0400
Subject: [PATCH] Install fedora-release-* at bootstrap phase for various
 images

This ensures that the correct variant packages are installed.
---
 components/desktop-environments.xml | 8 ++++++--
 platforms/server.xml                | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml
index 828a187..137449c 100644
--- a/components/desktop-environments.xml
+++ b/components/desktop-environments.xml
@@ -28,16 +28,20 @@
 	<packages type="uninstall" profiles="DesktopCommon">
 		<package name="xorg-x11-server-Xorg"/>
 	</packages>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="GNOME-Desktop">
+		<package name="fedora-release-workstation"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
 		<namedCollection name="workstation-product-environment"/>
-		<package name="fedora-release-workstation"/>
+	</packages>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Desktop">
+		<package name="fedora-release-kde"/>
 	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
 		<namedCollection name="kde-desktop-environment"/>
 		<namedCollection name="kde-apps"/>
 		<namedCollection name="kde-media"/>
 		<package name="fuse"/>
-		<package name="fedora-release-kde"/>
 		<package name="kde-l10n"/>
 		<package name="calamares-firstboot-config"/>
 		<ignore name="@admin-tools"/>
diff --git a/platforms/server.xml b/platforms/server.xml
index 33b53cf..c91c287 100644
--- a/platforms/server.xml
+++ b/platforms/server.xml
@@ -18,9 +18,11 @@
 			</oemconfig>
 		</type>
 	</preferences>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Server">
+		<package name="fedora-release-server"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="Server">
 		<namedCollection name="container-management"/>
 		<namedCollection name="server-product-environment"/>
-		<package name="fedora-release-server"/>
 	</packages>
 </image>