From 20501f4e5825f2053765ea9ed2d73da103e3345f Mon Sep 17 00:00:00 2001
From: Diaa Sami <disami@redhat.com>
Date: Wed, 8 Sep 2021 11:58:57 +0200
Subject: [PATCH] Fix package sets for tar installer image type

---
 internal/distro/rhel90/distro.go       |  7 ++-----
 internal/distro/rhel90/package_sets.go | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go
index d8b60c87e..253beb070 100644
--- a/internal/distro/rhel90/distro.go
+++ b/internal/distro/rhel90/distro.go
@@ -787,11 +787,8 @@ func newDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
 		filename: "installer.iso",
 		mimeType: "application/x-iso9660-image",
 		packageSets: map[string]rpmmd.PackageSet{
-			buildPkgsKey: x8664InstallerBuildPackageSet(),
-			osPkgsKey: {
-				Include: []string{"lvm2", "policycoreutils", "selinux-policy-targeted"},
-				Exclude: []string{"rng-tools"},
-			},
+			buildPkgsKey:     x8664InstallerBuildPackageSet(),
+			osPkgsKey:        bareMetalPackageSet(),
 			installerPkgsKey: installerPackageSet(),
 		},
 		rpmOstree: false,
diff --git a/internal/distro/rhel90/package_sets.go b/internal/distro/rhel90/package_sets.go
index 25ac5c03c..f28525c9b 100644
--- a/internal/distro/rhel90/package_sets.go
+++ b/internal/distro/rhel90/package_sets.go
@@ -399,3 +399,23 @@ func edgeInstallerPackageSet() rpmmd.PackageSet {
 		Exclude: nil,
 	}
 }
+
+func bareMetalPackageSet() rpmmd.PackageSet {
+	return rpmmd.PackageSet{
+		Include: []string{
+			"authselect-compat", "chrony", "cockpit-system", "cockpit-ws",
+			"@core", "dhcp-client", "dnf", "dnf-utils", "dosfstools",
+			"insights-client", "iwl1000-firmware", "iwl100-firmware",
+			"iwl105-firmware", "iwl135-firmware", "iwl2000-firmware",
+			"iwl2030-firmware", "iwl3160-firmware", "iwl5000-firmware",
+			"iwl5150-firmware", "iwl6000g2a-firmware", "iwl6000g2b-firmware",
+			"iwl6050-firmware", "iwl7260-firmware", "lvm2", "net-tools",
+			"NetworkManager", "nfs-utils", "oddjob", "oddjob-mkhomedir",
+			"policycoreutils", "psmisc", "python3-jsonschema",
+			"qemu-guest-agent", "redhat-release", "redhat-release-eula",
+			"rsync", "selinux-policy-targeted", "subscription-manager-cockpit",
+			"tar", "tcpdump", "yum",
+		},
+		Exclude: nil,
+	}
+}