iso: consolidate package lists

There is no need to have them separate.
osbuild · Jan 10, 2024 · 4a9d670 · 4a9d670
1 parent 1abbe67
commit 4a9d670
Showing 1 changed file with 5 additions and 32 deletions.
diff --git a/bib/cmd/bootc-image-builder/image.go b/bib/cmd/bootc-image-builder/image.go
@@ -171,35 +171,6 @@ func pipelinesForISO(c *ManifestConfig, rng *rand.Rand) (image.ImageKind, error)
 	img.SquashfsCompression = "lz4"
 
 	img.ExtraBasePackages = rpmmd.PackageSet{
-		Include: []string{
-			"anaconda-dracut",
-			"atheros-firmware",
-			"brcmfmac-firmware",
-			"curl",
-			"dracut-config-generic",
-			"dracut-network",
-			"hostname",
-			"iwlwifi-dvm-firmware",
-			"iwlwifi-mvm-firmware",
-			"kernel",
-			"linux-firmware",
-			"less",
-			"nfs-utils",
-			"openssh-clients",
-			"ostree",
-			"plymouth",
-			"realtek-firmware",
-			"rng-tools",
-			"rpcbind",
-			"selinux-policy-targeted",
-			"systemd",
-			"tar",
-			"xfsprogs",
-			"xz",
-		},
-	}
-
-	img.ExtraBasePackages = img.ExtraBasePackages.Append(rpmmd.PackageSet{
 		Include: []string{
 			"aajohan-comfortaa-fonts",
 			"abattis-cantarell-fonts",
@@ -253,6 +224,7 @@ func pipelinesForISO(c *ManifestConfig, rng *rand.Rand) (image.ImageKind, error)
 			"kernel",
 			"khmeros-base-fonts",
 			"less",
+			"less",
 			"libblockdev-lvm-dbus",
 			"libibverbs",
 			"libreport-plugin-bugzilla",
@@ -262,12 +234,12 @@ func pipelinesForISO(c *ManifestConfig, rng *rand.Rand) (image.ImageKind, error)
 			"lldpad",
 			"lsof",
 			"madan-fonts",
-			"mtr",
 			"mt-st",
+			"mtr",
 			"net-tools",
 			"nfs-utils",
-			"nmap-ncat",
 			"nm-connection-editor",
+			"nmap-ncat",
 			"nss-tools",
 			"openssh-clients",
 			"openssh-server",
@@ -311,7 +283,8 @@ func pipelinesForISO(c *ManifestConfig, rng *rand.Rand) (image.ImageKind, error)
 			"xrdb",
 			"xz",
 		},
-	})
+	}
+
 	img.ISOLabelTempl = "Container-Installer-%s"
 
 	var customizations *blueprint.Customizations