Repository: osbuild/osbuild-composer
Pull request #2854 (2022-07-25 15:06:12)

Fix UEFI HTTP boot for RHEL 9 ISOs
The RHEL 9 and CS9 ISOs would fail to boot over UEFI HTTP.  Added the necessary dracut and kernel modules to support this.

The second commit adds all kernel modules that are in the official RHEL 9 ISO's initramfs and were not on ours.

See rhbz#2030730

Manifests regenerated for each commit.  Image info dropped for all updated manifests that had any.

achilleas-k: Of course I forgot the manifests 🤦 
henrywang: @achilleas-k This fix should be for edge-installer as well? What about RHEL 8? Thanks.
achilleas-k: > @achilleas-k This fix should be for edge-installer as well?

Yes, this is also for the edge installer.

> What about RHEL 8?

I ran the same test on RHEL 8 and it worked without issues.


gicmo: Args, I hate the `update` button defaulting to merge commit. Let me fix that.

Patch:
diff --git a/internal/distro/rhel90/package_sets.go b/internal/distro/rhel90/package_sets.go
index 4e3b8895e..72fea8a5f 100644
--- a/internal/distro/rhel90/package_sets.go
+++ b/internal/distro/rhel90/package_sets.go
@@ -1223,6 +1223,7 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 			"nmap-ncat",
 			"nm-connection-editor",
 			"nss-tools",
+			"nvme-cli", // for nvmf dracut module
 			"openssh-clients",
 			"openssh-server",
 			"oscap-anaconda-addon",
diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go
index 26d631261..5c899bd1a 100644
--- a/internal/distro/rhel90/pipelines.go
+++ b/internal/distro/rhel90/pipelines.go
@@ -1045,17 +1045,23 @@ func anacondaTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec
 	p.AddStage(osbuild.NewUsersStage(usersStageOptions))
 	p.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(users)))
 	p.AddStage(osbuild.NewLoraxScriptStage(loraxScriptStageOptions(arch)))
-	p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{
+	dso := dracutStageOptions(kernelVer, arch, []string{
 		"anaconda",
-		"rdma",
-		"rngd",
-		"multipath",
 		"fcoe",
 		"fcoe-uefi",
 		"iscsi",
 		"lunmask",
+		"multipath",
 		"nfs",
-	})))
+		"nvdimm", // non-volatile DIMM firmware (provides nfit, cuse, and nd_e820)
+		"nvmf",
+		"rdma",
+		"rngd",
+	})
+	// drivers / kernel modules to add explicitly for parity with the official
+	// RHEL 9.0 ISO
+	dso.AddDrivers = []string{"cuse", "ipmi_devintf", "ipmi_msghandler"}
+	p.AddStage(osbuild.NewDracutStage(dso))
 	p.AddStage(osbuild.NewSELinuxConfigStage(&osbuild.SELinuxConfigStageOptions{State: osbuild.SELinuxStatePermissive}))
 
 	return p


Test patch:
diff --git a/test/cases/diff-manifests.sh b/test/cases/diff-manifests.sh
index f2f2956ed..57a82cbd1 100755
--- a/test/cases/diff-manifests.sh
+++ b/test/cases/diff-manifests.sh
@@ -56,10 +56,8 @@ sudo dnf build-dep -y osbuild-composer.spec
 manifestdir=$(mktemp -d)
 
 greenprint "Generating all manifests for HEAD (PR #${prnum})"
-go run ./cmd/gen-manifests --output "${manifestdir}/PR" --workers 50
-err=$?
-if (( err != 0 )); then
-    greenprint "Manifest generation on PR HEAD failed"
+if ! go run ./cmd/gen-manifests --output "${manifestdir}/PR" --workers 50; then
+    redprint "Manifest generation on PR HEAD failed"
     exit 1
 fi
 
@@ -72,21 +70,14 @@ greenprint "Generating all manifests for merge-base (${mergebase})"
 # NOTE: it's not an error if this task fails; manifest generation on base
 # branch can be broken in a PR that fixes it.
 # As long as the generation on the PR HEAD succeeds, the job should succeed.
-go run ./cmd/gen-manifests --output "${manifestdir}/${mergebase}" --workers 50
-err=$?
 merge_base_fail=""
-if (( err != 0 )); then
-    greenprint "Manifest generation on merge-base failed"
+if ! go run ./cmd/gen-manifests --output "${manifestdir}/${mergebase}" --workers 50; then
+    redprint "Manifest generation on merge-base failed"
     merge_base_fail="**NOTE:** Manifest generation on merge-base with \`${basebranch}\` (${mergebase}) failed.\n\n"
 fi
 
 greenprint "Diff: ${manifestdir}/${mergebase} ${manifestdir}/PR"
-diff=$(diff -Naur "${manifestdir}"/"${mergebase}" "${manifestdir}/PR")
-err=$?
-
-review_data_file="review.json"
-
-if (( err == 0 )); then
+if diff=$(diff -Naur "${manifestdir}"/"${mergebase}" "${manifestdir}/PR"); then
     greenprint "No changes in manifests"
     exit 0
 fi
@@ -97,6 +88,7 @@ greenprint "Saved diff in job artifacts"
 
 artifacts_url="${CI_JOB_URL}/artifacts/browse"
 
+review_data_file="review.json"
 cat > "${review_data_file}" << EOF
 {"body":"⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD ${head} with the ${basebranch} merge-base ${mergebase}).  Please review the changes.  The changes can be found in the [artifacts of the \`Manifest-diff\` job [0]](${artifacts_url}) as \`manifests.diff\`.\n\n${merge_base_fail}[0] ${artifacts_url}","event":"COMMENT"}
 EOF
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
index 715f335c3..9fc11f763 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
@@ -8128,6 +8128,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:9130a491601594bf3791ee1fafd81840e9b9e66f111b2002236d144c7b65c081",
                     "options": {
@@ -9096,14 +9104,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -10762,6 +10777,9 @@
           "sha256:8a7da28db1c8dea227e2e3bf45e22d6f3920b44466d82392db10bc5a202ffcce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/fwupd-1.5.9-3.el9.aarch64.rpm"
           },
+          "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm"
+          },
           "sha256:8abb0ab85d37efc7a8a6132e3f9398f0179fa791bf118fd9f87119adaec621e2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220208/Packages/perl-B-1.80-479.el9.aarch64.rpm"
           },
@@ -22085,6 +22103,16 @@
         "checksum": "sha256:95bd797672d70a8752fb881c4ff04ccc14234842dfd9de6bc48373dd96c1ec81",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.14",
+        "release": "3.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm",
+        "checksum": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
index e3b228f03..c17b14eb3 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
@@ -8157,6 +8157,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:9130a491601594bf3791ee1fafd81840e9b9e66f111b2002236d144c7b65c081",
                     "options": {
@@ -9126,14 +9134,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -10814,6 +10829,9 @@
           "sha256:8a7da28db1c8dea227e2e3bf45e22d6f3920b44466d82392db10bc5a202ffcce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/fwupd-1.5.9-3.el9.aarch64.rpm"
           },
+          "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm"
+          },
           "sha256:8abb0ab85d37efc7a8a6132e3f9398f0179fa791bf118fd9f87119adaec621e2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220208/Packages/perl-B-1.80-479.el9.aarch64.rpm"
           },
@@ -22137,6 +22155,16 @@
         "checksum": "sha256:95bd797672d70a8752fb881c4ff04ccc14234842dfd9de6bc48373dd96c1ec81",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.14",
+        "release": "3.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm",
+        "checksum": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-aarch64-image_installer-boot.json b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
index 2767df798..db9e71310 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
@@ -11821,6 +11821,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:9130a491601594bf3791ee1fafd81840e9b9e66f111b2002236d144c7b65c081",
                     "options": {
@@ -12790,14 +12798,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -14445,6 +14460,9 @@
           "sha256:8a7da28db1c8dea227e2e3bf45e22d6f3920b44466d82392db10bc5a202ffcce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/fwupd-1.5.9-3.el9.aarch64.rpm"
           },
+          "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm"
+          },
           "sha256:8abb0ab85d37efc7a8a6132e3f9398f0179fa791bf118fd9f87119adaec621e2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220208/Packages/perl-B-1.80-479.el9.aarch64.rpm"
           },
@@ -25729,6 +25747,16 @@
         "checksum": "sha256:95bd797672d70a8752fb881c4ff04ccc14234842dfd9de6bc48373dd96c1ec81",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.14",
+        "release": "3.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm",
+        "checksum": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
index 1f532b077..b990b7a31 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
@@ -11850,6 +11850,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:9130a491601594bf3791ee1fafd81840e9b9e66f111b2002236d144c7b65c081",
                     "options": {
@@ -12819,14 +12827,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -14496,6 +14511,9 @@
           "sha256:8a7da28db1c8dea227e2e3bf45e22d6f3920b44466d82392db10bc5a202ffcce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/fwupd-1.5.9-3.el9.aarch64.rpm"
           },
+          "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm"
+          },
           "sha256:8abb0ab85d37efc7a8a6132e3f9398f0179fa791bf118fd9f87119adaec621e2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20220208/Packages/perl-B-1.80-479.el9.aarch64.rpm"
           },
@@ -25780,6 +25798,16 @@
         "checksum": "sha256:95bd797672d70a8752fb881c4ff04ccc14234842dfd9de6bc48373dd96c1ec81",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.14",
+        "release": "3.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.aarch64.rpm",
+        "checksum": "sha256:8aa984accb80c96a9e7569feef196c19408e063b3c40b6f55b60473ae10e9cbb",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
index dbe3cf103..41804bb20 100644
--- a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
@@ -8271,6 +8271,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:879771cd51bb4ef2afd2e4a8d29b4f66040ec7f0f47d647f2c00ab0122bdf8e0",
                     "options": {
@@ -9257,14 +9265,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -10893,6 +10908,9 @@
           "sha256:88bbb9c78ed4935955e5768f30829922cdbdd288917a32bcaf645868c9bb5026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/crypto-policies-scripts-20220203-1.gitf03e75e.el9.noarch.rpm"
           },
+          "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm"
+          },
           "sha256:89728c73d1ba9818e95789a5b862ff9649cb934884e2733fca628277c5ef2d49": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220208/Packages/protobuf-c-1.3.3-9.el9.x86_64.rpm"
           },
@@ -22455,6 +22473,16 @@
         "checksum": "sha256:a7da4ef003bc60045bc60dae299b703e7f1db326f25208fb922ce1b79e2882da",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.14",
+        "release": "3.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm",
+        "checksum": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
index 70bb4a65b..6d3833113 100644
--- a/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
@@ -8300,6 +8300,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:879771cd51bb4ef2afd2e4a8d29b4f66040ec7f0f47d647f2c00ab0122bdf8e0",
                     "options": {
@@ -9287,14 +9295,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -10945,6 +10960,9 @@
           "sha256:88bbb9c78ed4935955e5768f30829922cdbdd288917a32bcaf645868c9bb5026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/crypto-policies-scripts-20220203-1.gitf03e75e.el9.noarch.rpm"
           },
+          "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm"
+          },
           "sha256:89728c73d1ba9818e95789a5b862ff9649cb934884e2733fca628277c5ef2d49": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220208/Packages/protobuf-c-1.3.3-9.el9.x86_64.rpm"
           },
@@ -22507,6 +22525,16 @@
         "checksum": "sha256:a7da4ef003bc60045bc60dae299b703e7f1db326f25208fb922ce1b79e2882da",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.14",
+        "release": "3.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm",
+        "checksum": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-x86_64-image_installer-boot.json b/test/data/manifests/centos_9-x86_64-image_installer-boot.json
index 0721d858c..a1b4b1d36 100644
--- a/test/data/manifests/centos_9-x86_64-image_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-image_installer-boot.json
@@ -12029,6 +12029,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:879771cd51bb4ef2afd2e4a8d29b4f66040ec7f0f47d647f2c00ab0122bdf8e0",
                     "options": {
@@ -13016,14 +13024,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -14643,6 +14658,9 @@
           "sha256:88bbb9c78ed4935955e5768f30829922cdbdd288917a32bcaf645868c9bb5026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/crypto-policies-scripts-20220203-1.gitf03e75e.el9.noarch.rpm"
           },
+          "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm"
+          },
           "sha256:89728c73d1ba9818e95789a5b862ff9649cb934884e2733fca628277c5ef2d49": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220208/Packages/protobuf-c-1.3.3-9.el9.x86_64.rpm"
           },
@@ -26169,6 +26187,16 @@
         "checksum": "sha256:a7da4ef003bc60045bc60dae299b703e7f1db326f25208fb922ce1b79e2882da",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.14",
+        "release": "3.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm",
+        "checksum": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/centos_9-x86_64-image_installer_with_users-boot.json b/test/data/manifests/centos_9-x86_64-image_installer_with_users-boot.json
index 4f1d7bfbe..fd4395f39 100644
--- a/test/data/manifests/centos_9-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-x86_64-image_installer_with_users-boot.json
@@ -12058,6 +12058,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:879771cd51bb4ef2afd2e4a8d29b4f66040ec7f0f47d647f2c00ab0122bdf8e0",
                     "options": {
@@ -13045,14 +13053,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -14694,6 +14709,9 @@
           "sha256:88bbb9c78ed4935955e5768f30829922cdbdd288917a32bcaf645868c9bb5026": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/crypto-policies-scripts-20220203-1.gitf03e75e.el9.noarch.rpm"
           },
+          "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm"
+          },
           "sha256:89728c73d1ba9818e95789a5b862ff9649cb934884e2733fca628277c5ef2d49": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20220208/Packages/protobuf-c-1.3.3-9.el9.x86_64.rpm"
           },
@@ -26220,6 +26238,16 @@
         "checksum": "sha256:a7da4ef003bc60045bc60dae299b703e7f1db326f25208fb922ce1b79e2882da",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.14",
+        "release": "3.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20220208/Packages/nvme-cli-1.14-3.el9.x86_64.rpm",
+        "checksum": "sha256:89233769b317900c1d20f6d05cc88f936438e820c74de209f0efec2dca4cc22e",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
index 638b93e83..2a12c08ed 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
@@ -1723,6 +1723,9 @@
                   {
                     "id": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
                   },
+                  {
+                    "id": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
+                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac"
                   },
@@ -3566,14 +3569,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -4572,6 +4582,9 @@
           "sha256:4f1f5c0c2f4e131af3839456a1e191da440b62559b289820f942edaa2a2ca354": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/libmaxminddb-1.5.2-3.el9.aarch64.rpm"
           },
+          "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm"
+          },
           "sha256:4f52b48ea331a31c91582de5377507caf3400970ff40b7f242e0ad5b93d5b9ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/gstreamer1-plugins-good-1.18.4-5.el9.aarch64.rpm"
           },
@@ -11474,6 +11487,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.aarch64.rpm",
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "2.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm",
+        "checksum": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
index a8d751523..0de0e7c08 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
@@ -1752,6 +1752,9 @@
                   {
                     "id": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
                   },
+                  {
+                    "id": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
+                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac"
                   },
@@ -3596,14 +3599,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -4624,6 +4634,9 @@
           "sha256:4f1f5c0c2f4e131af3839456a1e191da440b62559b289820f942edaa2a2ca354": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/libmaxminddb-1.5.2-3.el9.aarch64.rpm"
           },
+          "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm"
+          },
           "sha256:4f52b48ea331a31c91582de5377507caf3400970ff40b7f242e0ad5b93d5b9ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/gstreamer1-plugins-good-1.18.4-5.el9.aarch64.rpm"
           },
@@ -11526,6 +11539,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.aarch64.rpm",
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "2.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm",
+        "checksum": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
index 964930456..f3c3de6dc 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
@@ -3177,6 +3177,9 @@
                   {
                     "id": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
                   },
+                  {
+                    "id": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
+                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac"
                   },
@@ -5021,14 +5024,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -6037,6 +6047,9 @@
           "sha256:4f1f5c0c2f4e131af3839456a1e191da440b62559b289820f942edaa2a2ca354": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/libmaxminddb-1.5.2-3.el9.aarch64.rpm"
           },
+          "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm"
+          },
           "sha256:4f52b48ea331a31c91582de5377507caf3400970ff40b7f242e0ad5b93d5b9ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/gstreamer1-plugins-good-1.18.4-5.el9.aarch64.rpm"
           },
@@ -12888,6 +12901,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.aarch64.rpm",
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "2.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm",
+        "checksum": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
index e23c14598..5e516bfb3 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
@@ -3206,6 +3206,9 @@
                   {
                     "id": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
                   },
+                  {
+                    "id": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
+                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac"
                   },
@@ -5050,14 +5053,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -6088,6 +6098,9 @@
           "sha256:4f1f5c0c2f4e131af3839456a1e191da440b62559b289820f942edaa2a2ca354": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/libmaxminddb-1.5.2-3.el9.aarch64.rpm"
           },
+          "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm"
+          },
           "sha256:4f52b48ea331a31c91582de5377507caf3400970ff40b7f242e0ad5b93d5b9ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220208/Packages/gstreamer1-plugins-good-1.18.4-5.el9.aarch64.rpm"
           },
@@ -12939,6 +12952,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.aarch64.rpm",
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b"
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "2.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.aarch64.rpm",
+        "checksum": "sha256:4f2960344a8f7098953438409500ee9661b50f1fd1e6e5b1b32df317c0aabdba"
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
index 904f8d9aa..d1389983c 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
@@ -1762,6 +1762,9 @@
                   {
                     "id": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
                   },
+                  {
+                    "id": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
+                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575"
                   },
@@ -3630,14 +3633,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -5587,6 +5597,9 @@
           "sha256:a362e6e28a10e0214b16d03edd7f125015f95a611e03b7ee3b51ad8b3cc3ace6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/geoclue2-2.5.7-5.el9.x86_64.rpm"
           },
+          "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm"
+          },
           "sha256:a3aa10107f6fa6c6c2e5e0f134d137c7c5b0b77d118fb0f8cdf1e23167616e25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/p11-kit-0.24.1-2.el9.x86_64.rpm"
           },
@@ -11700,6 +11713,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.x86_64.rpm",
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "2.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm",
+        "checksum": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
index 705c27a84..985ce88a8 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
@@ -1791,6 +1791,9 @@
                   {
                     "id": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
                   },
+                  {
+                    "id": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
+                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575"
                   },
@@ -3660,14 +3663,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -5639,6 +5649,9 @@
           "sha256:a362e6e28a10e0214b16d03edd7f125015f95a611e03b7ee3b51ad8b3cc3ace6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/geoclue2-2.5.7-5.el9.x86_64.rpm"
           },
+          "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm"
+          },
           "sha256:a3aa10107f6fa6c6c2e5e0f134d137c7c5b0b77d118fb0f8cdf1e23167616e25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/p11-kit-0.24.1-2.el9.x86_64.rpm"
           },
@@ -11752,6 +11765,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.x86_64.rpm",
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "2.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm",
+        "checksum": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
index 2c99cdfc7..9267f0f7d 100644
--- a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
@@ -3243,6 +3243,9 @@
                   {
                     "id": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
                   },
+                  {
+                    "id": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
+                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575"
                   },
@@ -5112,14 +5115,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -7084,6 +7094,9 @@
           "sha256:a362e6e28a10e0214b16d03edd7f125015f95a611e03b7ee3b51ad8b3cc3ace6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/geoclue2-2.5.7-5.el9.x86_64.rpm"
           },
+          "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm"
+          },
           "sha256:a3aa10107f6fa6c6c2e5e0f134d137c7c5b0b77d118fb0f8cdf1e23167616e25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/p11-kit-0.24.1-2.el9.x86_64.rpm"
           },
@@ -13143,6 +13156,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.x86_64.rpm",
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "2.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm",
+        "checksum": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
index 0cc933fca..4204c1aa2 100644
--- a/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-image_installer_with_users-boot.json
@@ -3272,6 +3272,9 @@
                   {
                     "id": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
                   },
+                  {
+                    "id": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
+                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575"
                   },
@@ -5141,14 +5144,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -7135,6 +7145,9 @@
           "sha256:a362e6e28a10e0214b16d03edd7f125015f95a611e03b7ee3b51ad8b3cc3ace6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220208/Packages/geoclue2-2.5.7-5.el9.x86_64.rpm"
           },
+          "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm"
+          },
           "sha256:a3aa10107f6fa6c6c2e5e0f134d137c7c5b0b77d118fb0f8cdf1e23167616e25": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/p11-kit-0.24.1-2.el9.x86_64.rpm"
           },
@@ -13194,6 +13207,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/npth-1.6-8.el9.x86_64.rpm",
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6"
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "2.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220208/Packages/nvme-cli-1.16-2.el9.x86_64.rpm",
+        "checksum": "sha256:a3880caf866f28104c364359b644abafc77095ca6e4402c74db91557f5519a03"
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
index 6ace45654..1e6bab22f 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
@@ -4488,6 +4488,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac",
                     "options": {
@@ -9256,14 +9264,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -11369,6 +11384,9 @@
           "sha256:b66b63dc25e7eb3bba8af2ad2488b0920edc934a58ce9e5ba27f2a6905d9da5f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20220324/Packages/google-noto-cjk-fonts-common-20201206-4.el9.noarch.rpm"
           },
+          "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm"
+          },
           "sha256:b6a73c9da522df55690b886c0a9af39338571d34ee6f0d4d9b994c8289df3412": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/libattr-2.5.1-3.el9.aarch64.rpm"
           },
@@ -17749,6 +17767,16 @@
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "3.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm",
+        "checksum": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
index ac5aa200d..0bd2ce85b 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
@@ -4517,6 +4517,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac",
                     "options": {
@@ -9286,14 +9294,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -11421,6 +11436,9 @@
           "sha256:b66b63dc25e7eb3bba8af2ad2488b0920edc934a58ce9e5ba27f2a6905d9da5f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20220324/Packages/google-noto-cjk-fonts-common-20201206-4.el9.noarch.rpm"
           },
+          "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm"
+          },
           "sha256:b6a73c9da522df55690b886c0a9af39338571d34ee6f0d4d9b994c8289df3412": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/libattr-2.5.1-3.el9.aarch64.rpm"
           },
@@ -17801,6 +17819,16 @@
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "3.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm",
+        "checksum": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
index a53831609..92810c2de 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
@@ -8301,6 +8301,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac",
                     "options": {
@@ -13070,14 +13078,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -15193,6 +15208,9 @@
           "sha256:b66b63dc25e7eb3bba8af2ad2488b0920edc934a58ce9e5ba27f2a6905d9da5f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20220324/Packages/google-noto-cjk-fonts-common-20201206-4.el9.noarch.rpm"
           },
+          "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm"
+          },
           "sha256:b6a73c9da522df55690b886c0a9af39338571d34ee6f0d4d9b994c8289df3412": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/libattr-2.5.1-3.el9.aarch64.rpm"
           },
@@ -21513,6 +21531,16 @@
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "3.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm",
+        "checksum": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
index 32fd3639b..76530737a 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
@@ -8330,6 +8330,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:f08900533af1aa558b9ab4f64bfc17691fcddf1196b1585765a9997953e9aaac",
                     "options": {
@@ -13099,14 +13107,21 @@
                 "shutdown",
                 "uefi-lib",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -15244,6 +15259,9 @@
           "sha256:b66b63dc25e7eb3bba8af2ad2488b0920edc934a58ce9e5ba27f2a6905d9da5f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20220324/Packages/google-noto-cjk-fonts-common-20201206-4.el9.noarch.rpm"
           },
+          "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm"
+          },
           "sha256:b6a73c9da522df55690b886c0a9af39338571d34ee6f0d4d9b994c8289df3412": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/libattr-2.5.1-3.el9.aarch64.rpm"
           },
@@ -21564,6 +21582,16 @@
         "checksum": "sha256:6fb2eb0e66f94ce62b1f14f00704de0800664da8429df1df244ad7d9ee2c0b7b",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "3.el9",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.aarch64.rpm",
+        "checksum": "sha256:b6782ec48ed2eeb43385cd526ba42626b4ab6ab508297353da905f51736a3298",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
index dfb871cb1..05eca9289 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
@@ -4592,6 +4592,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575",
                     "options": {
@@ -9433,14 +9441,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -11903,6 +11918,9 @@
           "sha256:ce6dcb35f56a067393e94e5d49299a9ab256ad4949e6f86ac27e6b58516b18a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/kmod-libs-28-7.el9.x86_64.rpm"
           },
+          "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm"
+          },
           "sha256:cee202f1330ee17cfc3d5db3cd841594896cfda34b275da9bed1f5e6ccfaf644": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libwayland-client-1.19.0-4.el9.x86_64.rpm"
           },
@@ -18104,6 +18122,16 @@
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "3.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm",
+        "checksum": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
index 95bb7b4dc..2af236821 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
@@ -4621,6 +4621,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575",
                     "options": {
@@ -9463,14 +9471,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -11955,6 +11970,9 @@
           "sha256:ce6dcb35f56a067393e94e5d49299a9ab256ad4949e6f86ac27e6b58516b18a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/kmod-libs-28-7.el9.x86_64.rpm"
           },
+          "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm"
+          },
           "sha256:cee202f1330ee17cfc3d5db3cd841594896cfda34b275da9bed1f5e6ccfaf644": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libwayland-client-1.19.0-4.el9.x86_64.rpm"
           },
@@ -18156,6 +18174,16 @@
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "3.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm",
+        "checksum": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-x86_64-image_installer-boot.json b/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
index a4c2be986..0410dcfd1 100644
--- a/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-image_installer-boot.json
@@ -8477,6 +8477,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575",
                     "options": {
@@ -13319,14 +13327,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -15813,6 +15828,9 @@
           "sha256:ce6dcb35f56a067393e94e5d49299a9ab256ad4949e6f86ac27e6b58516b18a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/kmod-libs-28-7.el9.x86_64.rpm"
           },
+          "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm"
+          },
           "sha256:cee202f1330ee17cfc3d5db3cd841594896cfda34b275da9bed1f5e6ccfaf644": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libwayland-client-1.19.0-4.el9.x86_64.rpm"
           },
@@ -21942,6 +21960,16 @@
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "3.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm",
+        "checksum": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json b/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
index dcdf0397b..53de08989 100644
--- a/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-image_installer_with_users-boot.json
@@ -8506,6 +8506,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:8caf70f76bc314ccb0cfd75377f561f12289a8e5ffcf537df1fab1c0e9bb8575",
                     "options": {
@@ -13348,14 +13356,21 @@
                 "uefi-lib",
                 "biosdevname",
                 "anaconda",
-                "rdma",
-                "rngd",
-                "multipath",
                 "fcoe",
                 "fcoe-uefi",
                 "iscsi",
                 "lunmask",
-                "nfs"
+                "multipath",
+                "nfs",
+                "nvdimm",
+                "nvmf",
+                "rdma",
+                "rngd"
+              ],
+              "add_drivers": [
+                "cuse",
+                "ipmi_devintf",
+                "ipmi_msghandler"
               ],
               "install": [
                 "/.buildstamp"
@@ -15864,6 +15879,9 @@
           "sha256:ce6dcb35f56a067393e94e5d49299a9ab256ad4949e6f86ac27e6b58516b18a7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/kmod-libs-28-7.el9.x86_64.rpm"
           },
+          "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm"
+          },
           "sha256:cee202f1330ee17cfc3d5db3cd841594896cfda34b275da9bed1f5e6ccfaf644": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20220324/Packages/libwayland-client-1.19.0-4.el9.x86_64.rpm"
           },
@@ -21993,6 +22011,16 @@
         "checksum": "sha256:3e044d8534970034063e6445a142780bbe9d37f5e75b98f8788ade5470a32ab6",
         "check_gpg": true
       },
+      {
+        "name": "nvme-cli",
+        "epoch": 0,
+        "version": "1.16",
+        "release": "3.el9",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20220324/Packages/nvme-cli-1.16-3.el9.x86_64.rpm",
+        "checksum": "sha256:ce7f8f58e8e40f59b659f0ba36670cba570d9527e4330299399d8adaf6d19edf",
+        "check_gpg": true
+      },
       {
         "name": "openldap",
         "epoch": 0,