From 07705aea7a4ae4c44dcf843bfff06e2749a3507e Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Wed, 16 Feb 2022 17:46:57 +0100
Subject: [PATCH] distro/rhel90: split out arch-specific packages for anaconda

---
 internal/distro/rhel90/package_sets.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/internal/distro/rhel90/package_sets.go b/internal/distro/rhel90/package_sets.go
index 83e16341a..df2d0c515 100644
--- a/internal/distro/rhel90/package_sets.go
+++ b/internal/distro/rhel90/package_sets.go
@@ -948,7 +948,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"anaconda-widgets",
 			"audit",
 			"bind-utils",
-			"biosdevname",
 			"bitmap-fangsongti-fonts",
 			"bzip2",
 			"cryptsetup",
@@ -969,9 +968,7 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"glibc-all-langpacks",
 			"gnome-kiosk",
 			"google-noto-sans-cjk-ttc-fonts",
-			"grub2-efi-x64-cdboot",
 			"grub2-tools",
-			"grub2-tools-efi",
 			"grub2-tools-extra",
 			"grub2-tools-minimal",
 			"grubby",
@@ -1021,7 +1018,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"lohit-telugu-fonts",
 			"lsof",
 			"madan-fonts",
-			"memtest86+",
 			"mtr",
 			"mt-st",
 			"net-tools",
@@ -1048,7 +1044,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"rsyslog",
 			"selinux-policy-targeted",
 			"sg3_utils",
-			"shim-x64",
 			"sil-abyssinica-fonts",
 			"sil-padauk-fonts",
 			"sil-scheherazade-fonts",
@@ -1056,7 +1051,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"smc-meera-fonts",
 			"spice-vdagent",
 			"strace",
-			"syslinux",
 			"systemd",
 			"tar",
 			"thai-scalable-waree-fonts",
@@ -1087,6 +1081,7 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			Include: []string{
 				"biosdevname",
 				"dmidecode",
+				"grub2-tools-efi",
 				"memtest86+",
 			},
 		})