Fedora: Update package sets for upstream changes

Signed-off-by: Paul Whalen <[email protected]>

pkg/distro/fedora/package_sets.go

@@ -138,10 +138,8 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
 			"openssh-server",
 			"openssl",
 			"parsec",
-			"passwd",
 			"pinentry",
 			"podman",
-			"podman-plugins",
 			"policycoreutils",
 			"policycoreutils-python-utils",
 			"polkit",
@@ -177,6 +175,15 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
 		},
 	}
 
+	if common.VersionLessThan(t.arch.distro.osVersion, "40") {
+		ps = ps.Append(rpmmd.PackageSet{
+			Include: []string{
+				"passwd",         // provided by shadow-utils in F40+
+				"podman-plugins", // deprecated in podman 5
+			},
+		})
+	}
+
 	return ps
 }
 
@@ -221,7 +228,7 @@ func bootableContainerPackageSet(t *imageType) rpmmd.PackageSet {
 			"openssh-server",
 			"openssl",
 			"ostree",
-			"passwd", "shadow-utils", // User configuration
+			"shadow-utils", // User configuration
 			"podman",
 			"rpm-ostree",
 			"selinux-policy-targeted",
@@ -250,6 +257,14 @@ func bootableContainerPackageSet(t *imageType) rpmmd.PackageSet {
 		},
 	}
 
+	if common.VersionLessThan(t.arch.distro.osVersion, "40") {
+		ps = ps.Append(rpmmd.PackageSet{
+			Include: []string{
+				"passwd", // provided by shadow-utils in F40+
+			},
+		})
+	}
+
 	switch t.Arch().Name() {
 	case arch.ARCH_AARCH64.String():
 		ps.Append(rpmmd.PackageSet{
@@ -667,7 +682,6 @@ func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
 			"lvm2",
 			"mdadm",
 			"nss-softokn",
-			"passwd",
 			"policycoreutils",
 			"policycoreutils-python-utils",
 			"procps-ng",
@@ -679,5 +693,19 @@ func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
 		},
 	})
 
+	if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "40") {
+		ps = ps.Append(rpmmd.PackageSet{
+			Include: []string{
+				"shadow-utils", // includes passwd
+			},
+		})
+	} else if common.VersionLessThan(t.arch.distro.osVersion, "40") {
+		ps = ps.Append(rpmmd.PackageSet{
+			Include: []string{
+				"passwd",
+			},
+		})
+	}
+
 	return ps
 }