From b558e172c176b7b04a4376df7dd6639b6bd9fd5a Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Mon, 4 Mar 2024 20:18:11 -0500
Subject: Install fedora-release-* at bootstrap phase for various images

This ensures that the correct variant packages are installed.
---
 teams/budgie.xml      | 3 +++
 teams/cinnamon.xml    | 3 +++
 teams/cloud/cloud.xml | 3 +++
 teams/i3.xml          | 3 +++
 teams/kde.xml         | 3 +++
 teams/lxde.xml        | 3 +++
 teams/lxqt.xml        | 3 +++
 teams/mate.xml        | 3 +++
 teams/soas.xml        | 3 +++
 teams/sway.xml        | 3 +++
 teams/workstation.xml | 3 +++
 teams/xfce.xml        | 3 +++
 12 files changed, 36 insertions(+)

(limited to 'teams')

diff --git a/teams/budgie.xml b/teams/budgie.xml
index 665ca4b..415f0dd 100644
--- a/teams/budgie.xml
+++ b/teams/budgie.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Budgie-Live">
+		<package name="fedora-release-budgie"/>
+	</packages>
 </image>
diff --git a/teams/cinnamon.xml b/teams/cinnamon.xml
index 18c5cd2..db205a3 100644
--- a/teams/cinnamon.xml
+++ b/teams/cinnamon.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Cinnamon-Live">
+		<package name="fedora-release-cinnamon"/>
+	</packages>
 </image>
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index b2a4449..ecc2677 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -150,6 +150,9 @@
 			</oemconfig>
 		</type>
 	</preferences>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="CloudCore,CloudCoreUKI">
+		<package name="fedora-release-cloud"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="CloudCore">
 		<namedCollection name="cloud-server-environment"/>
 		<ignore name="dracut-config-rescue"/>
diff --git a/teams/i3.xml b/teams/i3.xml
index 6a21728..fcef4e7 100644
--- a/teams/i3.xml
+++ b/teams/i3.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="i3-Live">
+		<package name="fedora-release-i3"/>
+	</packages>
 </image>
diff --git a/teams/kde.xml b/teams/kde.xml
index 114f269..77749d1 100644
--- a/teams/kde.xml
+++ b/teams/kde.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Live">
+		<package name="fedora-release-kde"/>
+	</packages>
 </image>
diff --git a/teams/lxde.xml b/teams/lxde.xml
index f77f8ea..3660b2e 100644
--- a/teams/lxde.xml
+++ b/teams/lxde.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="LXDE-Live">
+		<package name="fedora-release-lxde"/>
+	</packages>
 </image>
diff --git a/teams/lxqt.xml b/teams/lxqt.xml
index ec974ab..41c741e 100644
--- a/teams/lxqt.xml
+++ b/teams/lxqt.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="LXQt-Live">
+		<package name="fedora-release-lxqt"/>
+	</packages>
 </image>
diff --git a/teams/mate.xml b/teams/mate.xml
index 2f6b566..5148afb 100644
--- a/teams/mate.xml
+++ b/teams/mate.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="MATE_Compiz-Live">
+		<package name="fedora-release-matecompiz"/>
+	</packages>
 </image>
diff --git a/teams/soas.xml b/teams/soas.xml
index 48878e4..31b1bab 100644
--- a/teams/soas.xml
+++ b/teams/soas.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="SoaS-Live">
+		<package name="fedora-release-soas"/>
+	</packages>
 </image>
diff --git a/teams/sway.xml b/teams/sway.xml
index 9e9603d..0ce036e 100644
--- a/teams/sway.xml
+++ b/teams/sway.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live">
+		<package name="fedora-release-sway"/>
+	</packages>
 </image>
diff --git a/teams/workstation.xml b/teams/workstation.xml
index ad362cd..fc61499 100644
--- a/teams/workstation.xml
+++ b/teams/workstation.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Workstation-Live">
+		<package name="fedora-release-workstation"/>
+	</packages>
 </image>
diff --git a/teams/xfce.xml b/teams/xfce.xml
index c563bbc..09c3d1c 100644
--- a/teams/xfce.xml
+++ b/teams/xfce.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Xfce-Live">
+		<package name="fedora-release-xfce"/>
+	</packages>
 </image>
-- 
cgit v1.3.1+13