From fed8edc51b74ce733585c6d511b3ee4935919714 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@linux.com>
Date: Fri, 19 Nov 2021 16:28:17 +0100
Subject: [PATCH] internal/rhel86: prune default dracut modules

Signed-off-by: Antonio Murdaca <runcom@linux.com>
---
 internal/distro/rhel86/package_sets.go  | 1 -
 internal/distro/rhel86/pipelines.go     | 8 ++++++++
 internal/distro/rhel86/stage_options.go | 8 --------
 internal/distro/rhel90/pipelines.go     | 8 ++++++++
 internal/distro/rhel90/stage_options.go | 8 --------
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/internal/distro/rhel86/package_sets.go b/internal/distro/rhel86/package_sets.go
index 4541a4a5a..70c5ac1b0 100644
--- a/internal/distro/rhel86/package_sets.go
+++ b/internal/distro/rhel86/package_sets.go
@@ -746,7 +746,6 @@ func edgeSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
 			"policycoreutils-python-utils",
 			"procps-ng",
 			"rootfiles",
-			"rdma-core",
 			"setools-console",
 			"sudo",
 			"traceroute",
diff --git a/internal/distro/rhel86/pipelines.go b/internal/distro/rhel86/pipelines.go
index 823073405..5f7aee836 100644
--- a/internal/distro/rhel86/pipelines.go
+++ b/internal/distro/rhel86/pipelines.go
@@ -1314,6 +1314,14 @@ func anacondaTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec
 	p.AddStage(osbuild.NewLoraxScriptStage(loraxScriptStageOptions(arch)))
 	p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{
 		"anaconda",
+		"rdma",
+		"rngd",
+		"multipath",
+		"fcoe",
+		"fcoe-uefi",
+		"iscsi",
+		"lunmask",
+		"nfs",
 	})))
 
 	return p
diff --git a/internal/distro/rhel86/stage_options.go b/internal/distro/rhel86/stage_options.go
index be96ed451..1941c1ea8 100644
--- a/internal/distro/rhel86/stage_options.go
+++ b/internal/distro/rhel86/stage_options.go
@@ -197,8 +197,6 @@ func dracutStageOptions(kernelVer, arch string, additionalModules []string) *osb
 		"systemd-initrd",
 		"modsign",
 		"nss-softokn",
-		"rdma",
-		"rngd",
 		"i18n",
 		"convertfs",
 		"network-manager",
@@ -218,14 +216,8 @@ func dracutStageOptions(kernelVer, arch string, additionalModules []string) *osb
 		"livenet",
 		"lvm",
 		"mdraid",
-		"multipath",
 		"qemu",
 		"qemu-net",
-		"fcoe",
-		"fcoe-uefi",
-		"iscsi",
-		"lunmask",
-		"nfs",
 		"resume",
 		"rootfs-block",
 		"terminfo",
diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go
index 383ca3248..39f8900d3 100644
--- a/internal/distro/rhel90/pipelines.go
+++ b/internal/distro/rhel90/pipelines.go
@@ -1306,6 +1306,14 @@ func anacondaTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec
 	p.AddStage(osbuild.NewLoraxScriptStage(loraxScriptStageOptions(arch)))
 	p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{
 		"anaconda",
+		"rdma",
+		"rngd",
+		"multipath",
+		"fcoe",
+		"fcoe-uefi",
+		"iscsi",
+		"lunmask",
+		"nfs",
 	})))
 
 	return p
diff --git a/internal/distro/rhel90/stage_options.go b/internal/distro/rhel90/stage_options.go
index 0e2a88da2..605f56312 100644
--- a/internal/distro/rhel90/stage_options.go
+++ b/internal/distro/rhel90/stage_options.go
@@ -183,8 +183,6 @@ func dracutStageOptions(kernelVer, arch string, additionalModules []string) *osb
 		"systemd-initrd",
 		"modsign",
 		"nss-softokn",
-		"rdma",
-		"rngd",
 		"i18n",
 		"convertfs",
 		"network-manager",
@@ -204,14 +202,8 @@ func dracutStageOptions(kernelVer, arch string, additionalModules []string) *osb
 		"livenet",
 		"lvm",
 		"mdraid",
-		"multipath",
 		"qemu",
 		"qemu-net",
-		"fcoe",
-		"fcoe-uefi",
-		"iscsi",
-		"lunmask",
-		"nfs",
 		"resume",
 		"rootfs-block",
 		"terminfo",