Repository: osbuild/osbuild-composer
Pull request #1594 (2021-07-27 09:49:17)

Fix differences between 8.4 and 8.5 image definitions
This pull request includes:

- [x] adequate testing for the new functionality or fixed issue
- [ ] adequate documentation informing people about the change such as
  - [ ] create a file in [news/unreleased](https://github.com/osbuild/osbuild-composer/tree/main/docs/news/unreleased) directory if this change should be mentioned in the release news
  - [ ] submit a PR for the [guides](https://github.com/osbuild/guides) repository if this PR changed any behavior described there: https://www.osbuild.org/guides/

<!--
Thanks for proposing a change to osbuild-composer!

Please don't remove the above check list. These are things that each pull
request must have before it is merged. It helps maintainers to not forget
anything.

If the reason for ticking any of the boxes is ambiguous, please add a short
note explaining why.

For user-visible changes, "adequate documentation" is an entry describing the
change for users in docs/news. Please refer to docs/news/README.md for details.

In addition, if this pull request fixes a downstream issue, please refer to
test/README.md and add these additional items:

- [ ] 1st commit of any `rhbz#` related PR contains bug reproducer; CI reports FAIL or
- [ ] PR contains automated tests for new functionality and
- [ ] QE has approved reproducer/new tests and
- [ ] Subsequent commits provide bug fixes without modifying the reproducer; CI reports PASS and
- [ ] QE approves this PR; RHBZ status is set to `MODIFIED + Verified=Tested`
-->

This PR is the result of a short investigation into the differences between the image types in RHEL 8.4 and 8.5, based on the output of the `image-info` tool (as it currently exists in the test manifests).

Elements fixed in this PR:
- AMI package exclude list
~~We (well, mostly @thozza) are working towards updating the AMI definitions to match the official images (https://issues.redhat.com/browse/COMPOSER-837).  The AMI definition I added in #1536 was an initial step towards this, where I updated the package list from the 8.4 definition.  Unfortunately, I neglected to include some packages to the exclusion list.  That's been fixed now.~~
    - I reverted the change in the AMI package lists since @thozza is currently working on bringing those up to date separately.
- GRUB 2 saved entry
As a consequence of the new way the blueprint packages are handled (as a separate package set), the wrong package set was searched for to detect the kernel and add the saved GRUB 2 value.  Fixed now.

Below is a list of other differences and the reasons they appeared.

## All (or most) image types

### New udev rule

Introduced in 8.5
```json
"/etc/udev/rules.d": {
  "70-persistent-ipoib.rules": []
}
```

Added by `rdma-core`.

**New package dependency for `libpcap`.**

## New rhsm options

- `auto_registration`
- `auto_registration_interval`

**Added in org.osbuild.rhsm stage**


## Edge commit

### rhsm.conf

Removed from 8.5.

**This is expected**: Subscription manager was meant to be excluded (#893) but then was re-added (un-excluded) (#1231) to edge image types.  Now it's no longer installed even when not explicitly excluded.

### dnf

Removed from 8.5

**This is expected**: dependency of subman (see above).



Patch:
diff --git a/internal/distro/rhel85/pipelines.go b/internal/distro/rhel85/pipelines.go
index 5161ed8eb..e5dfda61f 100644
--- a/internal/distro/rhel85/pipelines.go
+++ b/internal/distro/rhel85/pipelines.go
@@ -36,7 +36,7 @@ func qcow2Pipelines(t *imageType, customizations *blueprint.Customizations, opti
 	}
 	partitionTable := defaultPartitionTable(options, t.arch, rng)
 	treePipeline.AddStage(osbuild.NewFSTabStage(partitionTable.FSTabStageOptionsV2()))
-	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[osPkgsKey], t.arch.uefi, t.arch.legacy)))
+	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[blueprintPkgsKey], t.arch.uefi, t.arch.legacy)))
 	pipelines = append(pipelines, *treePipeline)
 
 	diskfile := "disk.img"
@@ -59,7 +59,7 @@ func vhdPipelines(t *imageType, customizations *blueprint.Customizations, option
 
 	partitionTable := defaultPartitionTable(options, t.arch, rng)
 	treePipeline.AddStage(osbuild.NewFSTabStage(partitionTable.FSTabStageOptionsV2()))
-	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[osPkgsKey], t.arch.uefi, t.arch.legacy)))
+	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[blueprintPkgsKey], t.arch.uefi, t.arch.legacy)))
 	pipelines = append(pipelines, *treePipeline)
 
 	diskfile := "disk.img"
@@ -84,7 +84,7 @@ func vmdkPipelines(t *imageType, customizations *blueprint.Customizations, optio
 
 	partitionTable := defaultPartitionTable(options, t.arch, rng)
 	treePipeline.AddStage(osbuild.NewFSTabStage(partitionTable.FSTabStageOptionsV2()))
-	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[osPkgsKey], t.arch.uefi, t.arch.legacy)))
+	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[blueprintPkgsKey], t.arch.uefi, t.arch.legacy)))
 	pipelines = append(pipelines, *treePipeline)
 
 	diskfile := "disk.img"
@@ -109,7 +109,7 @@ func openstackPipelines(t *imageType, customizations *blueprint.Customizations,
 
 	partitionTable := defaultPartitionTable(options, t.arch, rng)
 	treePipeline.AddStage(osbuild.NewFSTabStage(partitionTable.FSTabStageOptionsV2()))
-	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[osPkgsKey], t.arch.uefi, t.arch.legacy)))
+	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[blueprintPkgsKey], t.arch.uefi, t.arch.legacy)))
 	pipelines = append(pipelines, *treePipeline)
 
 	diskfile := "disk.img"
@@ -134,7 +134,7 @@ func amiPipelines(t *imageType, customizations *blueprint.Customizations, option
 
 	partitionTable := defaultPartitionTable(options, t.arch, rng)
 	treePipeline.AddStage(osbuild.NewFSTabStage(partitionTable.FSTabStageOptionsV2()))
-	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[osPkgsKey], t.arch.uefi, t.arch.legacy)))
+	treePipeline.AddStage(osbuild.NewGRUB2Stage(grub2StageOptions(&partitionTable, t.kernelOptions, customizations.GetKernel(), packageSetSpecs[blueprintPkgsKey], t.arch.uefi, t.arch.legacy)))
 	pipelines = append(pipelines, *treePipeline)
 
 	diskfile := t.Filename()
diff --git a/internal/store/json.go b/internal/store/json.go
index 1e43cf275..37919cc09 100644
--- a/internal/store/json.go
+++ b/internal/store/json.go
@@ -63,6 +63,7 @@ type sourceV0 struct {
 	CheckSSL bool     `json:"check_ssl"`
 	System   bool     `json:"system"`
 	Distros  []string `json:"distros"`
+	RHSM     bool     `json:"rhsm"`
 }
 
 type sourcesV0 map[string]sourceV0
diff --git a/internal/store/store.go b/internal/store/store.go
index 3a9d9d04d..cca330d0f 100644
--- a/internal/store/store.go
+++ b/internal/store/store.go
@@ -50,6 +50,7 @@ type SourceConfig struct {
 	CheckSSL bool     `json:"check_ssl" toml:"check_ssl"`
 	System   bool     `json:"system" toml:"system"`
 	Distros  []string `json:"distros" toml:"distros"`
+	RHSM     bool     `json:"rhsm" toml:"rhsm"`
 }
 
 type NotFoundError struct {
@@ -576,6 +577,7 @@ func (s *SourceConfig) RepoConfig(name string) rpmmd.RepoConfig {
 	repo.Name = name
 	repo.IgnoreSSL = !s.CheckSSL
 	repo.CheckGPG = s.CheckGPG
+	repo.RHSM = s.RHSM
 
 	if s.Type == "yum-baseurl" {
 		repo.BaseURL = s.URL
diff --git a/internal/weldr/json.go b/internal/weldr/json.go
index 6514ffc8e..893fc8c6b 100644
--- a/internal/weldr/json.go
+++ b/internal/weldr/json.go
@@ -187,6 +187,7 @@ func NewSourceConfigV1(id string, s store.SourceConfig) SourceConfigV1 {
 	sc.CheckSSL = s.CheckSSL
 	sc.System = s.System
 	sc.Distros = s.Distros
+	sc.RHSM = s.RHSM
 
 	return sc
 }
@@ -203,6 +204,7 @@ type SourceConfigV1 struct {
 	Proxy    string   `json:"proxy,omitempty" toml:"proxy,omitempty"`
 	GPGUrls  []string `json:"gpgkey_urls,omitempty" toml:"gpgkey_urls,omitempty"`
 	Distros  []string `json:"distros,omitempty" toml:"distros,omitempty"`
+	RHSM     bool     `json:"rhsm" toml:"rhsm"`
 }
 
 // Key returns the key, .ID in this case
@@ -229,6 +231,7 @@ func (s SourceConfigV1) SourceConfig() (ssc store.SourceConfig) {
 	ssc.CheckGPG = s.CheckGPG
 	ssc.CheckSSL = s.CheckSSL
 	ssc.Distros = s.Distros
+	ssc.RHSM = s.RHSM
 
 	return ssc
 }


Test patch:
diff --git a/internal/client/source_test.go b/internal/client/source_test.go
index 0040ae397..516f29161 100644
--- a/internal/client/source_test.go
+++ b/internal/client/source_test.go
@@ -490,6 +490,7 @@ func TestGetSourceInfoV1(t *testing.T) {
 		check_ssl = true
 		check_gpg = true
 		gpgkey_urls = ["https://url/path/to/gpg-key"]
+		rhsm = false
 	`
 	source = strings.Replace(source, "REPO-PATH", testState.repoDir, 1)
 
@@ -503,6 +504,7 @@ func TestGetSourceInfoV1(t *testing.T) {
 	require.Contains(t, info, "package-repo-info-v1", "No source info returned")
 	require.Equal(t, "repo for info test v1", info["package-repo-info-v1"].Name)
 	require.Equal(t, "file://"+testState.repoDir, info["package-repo-info-v1"].URL)
+	require.Equal(t, false, info["package-repo-info-v1"].RHSM)
 
 	resp, err = DeleteSourceV1(testState.socket, "package-repo-info-v1")
 	require.NoError(t, err, "DELETE source failed with a client error")
diff --git a/internal/weldr/api_test.go b/internal/weldr/api_test.go
index 814a9ce5e..8bce68ce8 100644
--- a/internal/weldr/api_test.go
+++ b/internal/weldr/api_test.go
@@ -1179,6 +1179,34 @@ check_gpg = false
 	}
 }
 
+func TestSourcesInfoTomlV1(t *testing.T) {
+	tempdir, err := ioutil.TempDir("", "weldr-tests-")
+	require.NoError(t, err)
+	defer os.RemoveAll(tempdir)
+
+	source := `
+id = "fish"
+name = "fish"
+url = "https://download.opensuse.org/repositories/shells:/fish:/release:/3/Fedora_29/"
+type = "yum-baseurl"
+rhsm = true
+`
+
+	sourceStr := `{"check_gpg":false,"check_ssl":false,"id":"fish","name":"fish","rhsm":true,"system":false,"type":"yum-baseurl","url":"https://download.opensuse.org/repositories/shells:/fish:/release:/3/Fedora_29/"}`
+
+	req := httptest.NewRequest("POST", "/api/v1/projects/source/new", bytes.NewReader([]byte(source)))
+	req.Header.Set("Content-Type", "text/x-toml")
+	recorder := httptest.NewRecorder()
+
+	api, _ := createWeldrAPI(tempdir, rpmmd_mock.BaseFixture)
+	api.ServeHTTP(recorder, req)
+
+	r := recorder.Result()
+	require.Equal(t, http.StatusOK, r.StatusCode)
+	test.TestRoute(t, api, true, "GET", "/api/v1/projects/source/info/fish", ``, 200, `{"sources":{"fish":`+sourceStr+`},"errors":[]}`)
+	test.TestRoute(t, api, true, "GET", "/api/v1/projects/source/info/fish?format=json", ``, 200, `{"sources":{"fish":`+sourceStr+`},"errors":[]}`)
+}
+
 // TestSourcesNewWrongTomlV1 Tests that Empty TOML, and invalid TOML should return an error
 func TestSourcesNewWrongTomlV1(t *testing.T) {
 	tempdir, err := ioutil.TempDir("", "weldr-tests-")
diff --git a/test/data/manifests/rhel_85-aarch64-ami-boot.json b/test/data/manifests/rhel_85-aarch64-ami-boot.json
index cbdb2a901..b3b49666d 100644
--- a/test/data/manifests/rhel_85-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-ami-boot.json
@@ -360,7 +360,6 @@
                   "sha256:2efbfbcce7ef24e433d3c304b6b6b022d1b1b8a972969da1adb1c3c85f9625a7",
                   "sha256:38a577a404acfad20ca5ab36e3b21da1f9277e41a48b7e229f2a5c98b41a2e88",
                   "sha256:63142839c5db7c96f022e17859f2eb86c63090f7282b77d21689d1ca0714b3fa",
-                  "sha256:4c070caf3c6231a2b5bd82e561b52c79173a7a4d67115ab7cad2d9653e0a4cc4",
                   "sha256:d05e21c5af6985d78e0029ef702907b5009785601c30476d3c6d8648299f43d2",
                   "sha256:5d70de79c29fd6d23a5fd993cf67f83f33af0ff6a7ee99b9a608948df3d2f4fd",
                   "sha256:3256e78263462d5d7ab37b696992aedd6f810431641ce8d1e1bc198c797b402b",
@@ -378,8 +377,6 @@
                   "sha256:3ee66f993ee567b2457a221ed364ae4f8dfe783a5f0e723d9169f95d12f9e696",
                   "sha256:634a3cbf0b334e901b6887176fa1b98246be7c4010b4c21cb6fd8fa7aa5fdf94",
                   "sha256:540fa90864b4eb0176b56e0c5e9d7bc6130985288ae297b4c38950381b08a827",
-                  "sha256:aedaac4c89e4ed16a03172ccd20dec3d67c4637a108b8b27029ad6ce385a1057",
-                  "sha256:c2970ca284358bf79000be1dfc690b1a3d1560eb6b4170ff5bfca5de007da8e5",
                   "sha256:97705dc5001791a6c1549ef5224f2c561ed96e00ac24fe6de30494a2e0cef1ec",
                   "sha256:e08305aecd924631284ddaeae39a83cca85495389d4ddef75410a32af49f946d",
                   "sha256:414770652a7eb33c0ffdf6c49709c3c5923f766eab2db4b5593e9c57d1d0f296",
@@ -416,10 +413,6 @@
                   "sha256:3f7e5e72ab9e18dbca936b40734c91520242a49a9e98a2f2589f397faa6ad8e8",
                   "sha256:9e98e551459cb6a858eab2c437b9e3869022137344467bb7331e26d542c03c32",
                   "sha256:03cca722444d33a3d66bba437601f727c112efd3fb150e0a0b840f8eb555556e",
-                  "sha256:da92fada5920a24577f614e1167e3b339d516ca646346c04c71ef2bd97295653",
-                  "sha256:8ae407fb97bfa1bcd669f4263d0b45dd7fc7e97c1371cc4b8f4360024a56e7bb",
-                  "sha256:8637735a961aa03a0c570e06d44d99263b6a6c5fc3ad73dc1410f8a2f840fa23",
-                  "sha256:6b4ceec4dbe19cd0d392005c552b2475549c30b11fd96a64b943431fec6902b6",
                   "sha256:2c306b1eb3ba478ae54b10e0deae7ff2e8b17a23f96cefcb3a9ec9bcdab2710a",
                   "sha256:d4a556f9a730ac1fe69ee426d486b7f98dce9abb48f145c14642d1a32167b68d",
                   "sha256:8599ab35a8be56b6fc9634a609bf6790115add63f17b278b28f511b4e9deeb4a",
@@ -483,10 +476,7 @@
                   "sha256:ba1364539f16d7c8379d7563fd0634651fa8a05b3f7098a21ba96e1f5641f132",
                   "sha256:32b26354cb64586912621908050cc9603a8e3b49db45636f27cb1dcd02f491a6",
                   "sha256:a90da335fcd969d32baa51b69d45380af08fdb65c080cc81f7c9256b47124b86",
-                  "sha256:16dd7121e6461d2c136f9f7330d8a60b88ed9ec77ac6824ac3ee7495acdb6800",
-                  "sha256:e85c24b0e9d047763e2c8e673bb6dc579b55c650e8f19d14c9010f3dc5cd0ccd",
                   "sha256:a5afbfeedd73a2e4bea50a08832145c5f4606a8518f97744dd09858852a0ada7",
-                  "sha256:db7899290e3f78a9cff3796d1181dc0ef3d837b3c80e715c7ca85e01a811093a",
                   "sha256:4874e739ed37bc6a5bfdb6069d4620e5f7efe01d60eb9fd2550c550167c99990",
                   "sha256:8c0d40edf059bf044314df38c84e26cfbe00bf4e687a6114eacb17251718312b",
                   "sha256:091c7cf9a81bc55f9d813c40904e1b7b4f8889df3584d0978e0f6770f01042e9",
@@ -556,7 +546,6 @@
                   "sha256:f99f5edde9ad4574b84264c467420c910b31f78683fbf1b63d106a7e6c9d64a3",
                   "sha256:e2c4ac0f7abf75cbcc7a6fb35412820c267f1a8ce614f41b60d901918c4616d5",
                   "sha256:f6df1feba76d87214433eee205e3b99621dcd78b485ed5f99ba2658117786b6c",
-                  "sha256:80555c598e51ea922b39b36404c95b5ae78cc0a5cdbc157e8b5aac9313cff353",
                   "sha256:daf36ee86ec6001770ae68bdd82409526faf4b9b1313a6b74fb54cfb98ff571e",
                   "sha256:c59a19d44466633bf19e18463ece1ec20cdeae962f1ea3613bd09a2ffb160318",
                   "sha256:f7a64b1cc43949294a02eaec57603a3d9d4d69648f389d146cf887777d595379",
@@ -599,7 +588,6 @@
                   "sha256:d255077bc4da7d238c3fe65d62a364b465a0638e0508bef2be09e03fefdd9b35",
                   "sha256:f7b5ea4f1d47bf21bc9e2f5fd2301c79d916830e2e02f91287455132c03fc48d",
                   "sha256:4fe7733b93fad52a48d4b47a6dc55582f3cc41fc2074e42a9b39fc5d407df6d3",
-                  "sha256:ecae9d32c793a198399a8642c171b7b57db2a0e35ee704f73a07da759197ae8e",
                   "sha256:31043a7324411dad6b84f6504a9e9cb7ece9f576acf091be522e484c8b82f469",
                   "sha256:7fd245efbd8214be4981128cfa05c59000c08b6ec0a9818f6f3c819c140ab7b9",
                   "sha256:114d977730d4a0ff1c56e63d4f11aca978bee0f6381413a9d5870fcd02b92f62",
@@ -615,7 +603,6 @@
                   "sha256:8db948c4e35bdc675cc942ef12296d8c9a3b652832e02f6c5147eaf026b5d161",
                   "sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f",
                   "sha256:8e2c0324789f42ebb6324847249699eb499544a3e6ad67ccd74713b3c1d6ce78",
-                  "sha256:fdf96973d893b98591cdffd54d8c7336d894785ac80977a1ddddf23ad1d73ad3",
                   "sha256:3446bbd5d26c3a1b8cd64c077ae4bbeea8ef2ef349c590297bbe2a53e18ce9e6",
                   "sha256:e5937aadc0580fe843579ca90ad87a39da9e0f729f8f1d4d0db018972b1ba19f",
                   "sha256:4702a5969b686f5f12532ba6eb660d704d117b2156d1188a0049114de93b4d62",
@@ -631,8 +618,6 @@
                   "sha256:65374d74a9aa8bbfbe67631c8be2f4e11f54ca89c8a015192f203b0fed9b01c1",
                   "sha256:1ed3940c0466986fa38fe9d3bd5fc6370b5e62edba51f7a8359eab786b4b81ec",
                   "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac",
-                  "sha256:7f2436df92ce3dacaf5a52d988e65b2cbfc6af8be917bdc14119940480efd7bb",
-                  "sha256:96b090a6696ca4c8b3f701c3a7b95b91c892db389e023c4b2d500a5162e43e8d",
                   "sha256:820822d1c982b88e32fbded3387ffa89716ae3ae02e4da573be97e10daf0436b",
                   "sha256:e68396d295297e9aa140d7cf895c3252efbb4d49e2a7a7a06691709c9345acfb",
                   "sha256:fd60066d9141529ea385fa8fc3af88d0f6ac0cb7a8515af0abe9b65498707f6f",
@@ -1239,9 +1224,6 @@
           "sha256:15c33124ac0479d34f1f58d2bd24cc52db7089b4a8681c276a3fd0d6dfe4fc72": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/coreutils-8.30-8.el8.aarch64.rpm"
           },
-          "sha256:16dd7121e6461d2c136f9f7330d8a60b88ed9ec77ac6824ac3ee7495acdb6800": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libnetfilter_conntrack-1.0.6-5.el8.aarch64.rpm"
-          },
           "sha256:17334b3eab9c115fa356739e551f50ec59c11709d27a3a5e6ccbff783c87988f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/trousers-0.3.15-1.el8.aarch64.rpm"
           },
@@ -1515,9 +1497,6 @@
           "sha256:4ad66a3a1dd79384852669609567108dcc429607d40ca8adc5f1dbe6a9d6bdde": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-pyudev-0.21.0-7.el8.noarch.rpm"
           },
-          "sha256:4c070caf3c6231a2b5bd82e561b52c79173a7a4d67115ab7cad2d9653e0a4cc4": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/dracut-config-rescue-049-135.git20210121.el8.aarch64.rpm"
-          },
           "sha256:4d6d7286d41c748839fdd1349f2aa3e5dfb352be6a288ab4322ecd9ecf91bcc2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/sssd-client-2.4.0-9.el8.aarch64.rpm"
           },
@@ -1668,9 +1647,6 @@
           "sha256:6b0834414e55caca5d165c84b152e71565b6295f325848f41b3122c5f4c4a8eb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/grub2-tools-minimal-2.02-99.el8.aarch64.rpm"
           },
-          "sha256:6b4ceec4dbe19cd0d392005c552b2475549c30b11fd96a64b943431fec6902b6": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/iptables-ebtables-1.8.4-17.el8.aarch64.rpm"
-          },
           "sha256:6b73380798b248fc1bf9435f22bec2269c21f903ebc4af64286ec30be10f3470": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/dbus-daemon-1.12.8-12.el8.aarch64.rpm"
           },
@@ -1743,18 +1719,12 @@
           "sha256:7d3931f1f8ea44964be5abed7aec8c3b803e761624809a31a427b819fa54fa37": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-dateutil-2.6.1-6.el8.noarch.rpm"
           },
-          "sha256:7f2436df92ce3dacaf5a52d988e65b2cbfc6af8be917bdc14119940480efd7bb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-slip-0.6.4-11.el8.noarch.rpm"
-          },
           "sha256:7fc33f147b99749fdbae420ed51277cb99d9b6418b7f739fe51c7563945bc0d7": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/hostname-3.20-6.el8.aarch64.rpm"
           },
           "sha256:7fd245efbd8214be4981128cfa05c59000c08b6ec0a9818f6f3c819c140ab7b9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-gpg-1.13.1-7.el8.aarch64.rpm"
           },
-          "sha256:80555c598e51ea922b39b36404c95b5ae78cc0a5cdbc157e8b5aac9313cff353": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/nftables-0.9.3-18.el8.aarch64.rpm"
-          },
           "sha256:80aae995798350ff2527b774b9da7bc562bc27a398d9ee2dbac52feb26f69e84": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/kmod-25-17.el8.aarch64.rpm"
           },
@@ -1791,9 +1761,6 @@
           "sha256:861346b2e683c09a53c9418a9ed08faf7448e066e3111482c70722cb62a6edce": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/polkit-libs-0.115-11.el8.aarch64.rpm"
           },
-          "sha256:8637735a961aa03a0c570e06d44d99263b6a6c5fc3ad73dc1410f8a2f840fa23": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/iptables-1.8.4-17.el8.aarch64.rpm"
-          },
           "sha256:876ffb285aaeddb2c18ae32527bd4ee202710bd8e18d5b410af22937646dcdec": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libxcrypt-4.1.1-4.el8.aarch64.rpm"
           },
@@ -1818,9 +1785,6 @@
           "sha256:8ad87d2f1daaa1679c7905fa26720f032a0bcfe68d58e63b805bb249c9321682": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/kernel-tools-libs-4.18.0-299.1.el8.aarch64.rpm"
           },
-          "sha256:8ae407fb97bfa1bcd669f4263d0b45dd7fc7e97c1371cc4b8f4360024a56e7bb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/ipset-libs-7.1-1.el8.aarch64.rpm"
-          },
           "sha256:8b20d88d6c82dac069400265b94526db17293ffb9188da66128ad4abfd15ea5e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/cpio-2.12-10.el8.aarch64.rpm"
           },
@@ -1890,9 +1854,6 @@
           "sha256:95630378635c5e89eb204b2921dbd5db2e87d949e167fcf022174a3e63b532cb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libref_array-0.1.5-39.el8.aarch64.rpm"
           },
-          "sha256:96b090a6696ca4c8b3f701c3a7b95b91c892db389e023c4b2d500a5162e43e8d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-slip-dbus-0.6.4-11.el8.noarch.rpm"
-          },
           "sha256:970589ec508d566e2a48ae2d874c68bbceb8548a1de6d393f72cd6a4c4b17622": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.5-20210326/Packages/lorax-28.14.58-1.el8.aarch64.rpm"
           },
@@ -2004,9 +1965,6 @@
           "sha256:ae411345ee8271ad3985d445d728a5f010eec9725f69b7ba5536099d3713b8b0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/librhsm-0.0.3-4.el8.aarch64.rpm"
           },
-          "sha256:aedaac4c89e4ed16a03172ccd20dec3d67c4637a108b8b27029ad6ce385a1057": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/firewalld-0.9.3-1.el8.noarch.rpm"
-          },
           "sha256:af98260ff2c263c9cefcb96d16d200941c1873cda9868b57df51b034066940fe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/openssh-8.0p1-5.el8.aarch64.rpm"
           },
@@ -2109,9 +2067,6 @@
           "sha256:c1d147e9504dc08e079f4f48d54239fae2ca3537ccd505f8657576c0e5994b65": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libpwquality-1.4.4-3.el8.aarch64.rpm"
           },
-          "sha256:c2970ca284358bf79000be1dfc690b1a3d1560eb6b4170ff5bfca5de007da8e5": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/firewalld-filesystem-0.9.3-1.el8.noarch.rpm"
-          },
           "sha256:c2f286f6b75caf1508829d748c35833ee5fba762e0175b1f5dbb23ab8ab2079e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/readline-7.0-10.el8.aarch64.rpm"
           },
@@ -2220,15 +2175,9 @@
           "sha256:da4d193d5f0caf7a196f3bd4aa1225072b522521d82fca8edecc6546b5460ac6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/e2fsprogs-libs-1.45.6-1.el8.aarch64.rpm"
           },
-          "sha256:da92fada5920a24577f614e1167e3b339d516ca646346c04c71ef2bd97295653": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/ipset-7.1-1.el8.aarch64.rpm"
-          },
           "sha256:daf36ee86ec6001770ae68bdd82409526faf4b9b1313a6b74fb54cfb98ff571e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/npth-1.5-4.el8.aarch64.rpm"
           },
-          "sha256:db7899290e3f78a9cff3796d1181dc0ef3d837b3c80e715c7ca85e01a811093a": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libnftnl-1.1.5-4.el8.aarch64.rpm"
-          },
           "sha256:dbc8445a77ef2921cc10b38c9ae21f434757df6e5e4f70b795297414afb6e609": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.5-20210326/Packages/libatasmart-0.19-14.el8.aarch64.rpm"
           },
@@ -2277,9 +2226,6 @@
           "sha256:e84ccbbba97c8f00ade8979d22578f30610dbba00f176b22b3a704a6c466b407": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.5-20210326/Packages/python3-pip-9.0.3-19.el8.noarch.rpm"
           },
-          "sha256:e85c24b0e9d047763e2c8e673bb6dc579b55c650e8f19d14c9010f3dc5cd0ccd": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libnfnetlink-1.0.1-13.el8.aarch64.rpm"
-          },
           "sha256:e8a5768895f9ef4a1fdc3740a0570e6b972f9ee6cc5e6d3bd38eb2bf80ccf847": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libxmlb-0.1.15-1.el8.aarch64.rpm"
           },
@@ -2295,9 +2241,6 @@
           "sha256:ec84264c5a188f1e717dcac04fb190869a3e801d54b0e83769e3f42b27fd180b": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/ncurses-base-6.1-7.20180224.el8.noarch.rpm"
           },
-          "sha256:ecae9d32c793a198399a8642c171b7b57db2a0e35ee704f73a07da759197ae8e": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-firewall-0.9.3-1.el8.noarch.rpm"
-          },
           "sha256:ed28e1e31109e27ce1c676914364c9f1dd46b71d00cb4cf13931f0fec6cf6978": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libtasn1-4.13-3.el8.aarch64.rpm"
           },
@@ -2412,9 +2355,6 @@
           "sha256:fddf61e9024c41073442ccff0c9990fa004e9b183f391c4e3cf3853e5ae6062c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/gettext-0.19.8.1-17.el8.aarch64.rpm"
           },
-          "sha256:fdf96973d893b98591cdffd54d8c7336d894785ac80977a1ddddf23ad1d73ad3": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-nftables-0.9.3-18.el8.aarch64.rpm"
-          },
           "sha256:fe1a3e821eab7aafd11152c5d5b9f6cf57de36d8ef3b517e0e2f2315b062742c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-jwt-1.6.1-2.el8.noarch.rpm"
           },
@@ -6616,15 +6556,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/dracut-config-generic-049-135.git20210121.el8.aarch64.rpm",
         "checksum": "sha256:63142839c5db7c96f022e17859f2eb86c63090f7282b77d21689d1ca0714b3fa"
       },
-      {
-        "name": "dracut-config-rescue",
-        "epoch": 0,
-        "version": "049",
-        "release": "135.git20210121.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/dracut-config-rescue-049-135.git20210121.el8.aarch64.rpm",
-        "checksum": "sha256:4c070caf3c6231a2b5bd82e561b52c79173a7a4d67115ab7cad2d9653e0a4cc4"
-      },
       {
         "name": "dracut-network",
         "epoch": 0,
@@ -6778,24 +6709,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/findutils-4.6.0-20.el8.aarch64.rpm",
         "checksum": "sha256:540fa90864b4eb0176b56e0c5e9d7bc6130985288ae297b4c38950381b08a827"
       },
-      {
-        "name": "firewalld",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "1.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/firewalld-0.9.3-1.el8.noarch.rpm",
-        "checksum": "sha256:aedaac4c89e4ed16a03172ccd20dec3d67c4637a108b8b27029ad6ce385a1057"
-      },
-      {
-        "name": "firewalld-filesystem",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "1.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/firewalld-filesystem-0.9.3-1.el8.noarch.rpm",
-        "checksum": "sha256:c2970ca284358bf79000be1dfc690b1a3d1560eb6b4170ff5bfca5de007da8e5"
-      },
       {
         "name": "freetype",
         "epoch": 0,
@@ -7120,42 +7033,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/iproute-5.9.0-4.el8.aarch64.rpm",
         "checksum": "sha256:03cca722444d33a3d66bba437601f727c112efd3fb150e0a0b840f8eb555556e"
       },
-      {
-        "name": "ipset",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/ipset-7.1-1.el8.aarch64.rpm",
-        "checksum": "sha256:da92fada5920a24577f614e1167e3b339d516ca646346c04c71ef2bd97295653"
-      },
-      {
-        "name": "ipset-libs",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/ipset-libs-7.1-1.el8.aarch64.rpm",
-        "checksum": "sha256:8ae407fb97bfa1bcd669f4263d0b45dd7fc7e97c1371cc4b8f4360024a56e7bb"
-      },
-      {
-        "name": "iptables",
-        "epoch": 0,
-        "version": "1.8.4",
-        "release": "17.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/iptables-1.8.4-17.el8.aarch64.rpm",
-        "checksum": "sha256:8637735a961aa03a0c570e06d44d99263b6a6c5fc3ad73dc1410f8a2f840fa23"
-      },
-      {
-        "name": "iptables-ebtables",
-        "epoch": 0,
-        "version": "1.8.4",
-        "release": "17.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/iptables-ebtables-1.8.4-17.el8.aarch64.rpm",
-        "checksum": "sha256:6b4ceec4dbe19cd0d392005c552b2475549c30b11fd96a64b943431fec6902b6"
-      },
       {
         "name": "iptables-libs",
         "epoch": 0,
@@ -7723,24 +7600,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libndp-1.7-4.el8.aarch64.rpm",
         "checksum": "sha256:a90da335fcd969d32baa51b69d45380af08fdb65c080cc81f7c9256b47124b86"
       },
-      {
-        "name": "libnetfilter_conntrack",
-        "epoch": 0,
-        "version": "1.0.6",
-        "release": "5.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libnetfilter_conntrack-1.0.6-5.el8.aarch64.rpm",
-        "checksum": "sha256:16dd7121e6461d2c136f9f7330d8a60b88ed9ec77ac6824ac3ee7495acdb6800"
-      },
-      {
-        "name": "libnfnetlink",
-        "epoch": 0,
-        "version": "1.0.1",
-        "release": "13.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libnfnetlink-1.0.1-13.el8.aarch64.rpm",
-        "checksum": "sha256:e85c24b0e9d047763e2c8e673bb6dc579b55c650e8f19d14c9010f3dc5cd0ccd"
-      },
       {
         "name": "libnfsidmap",
         "epoch": 1,
@@ -7750,15 +7609,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libnfsidmap-2.3.3-41.el8.aarch64.rpm",
         "checksum": "sha256:a5afbfeedd73a2e4bea50a08832145c5f4606a8518f97744dd09858852a0ada7"
       },
-      {
-        "name": "libnftnl",
-        "epoch": 0,
-        "version": "1.1.5",
-        "release": "4.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/libnftnl-1.1.5-4.el8.aarch64.rpm",
-        "checksum": "sha256:db7899290e3f78a9cff3796d1181dc0ef3d837b3c80e715c7ca85e01a811093a"
-      },
       {
         "name": "libnghttp2",
         "epoch": 0,
@@ -8380,15 +8230,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/newt-0.52.20-11.el8.aarch64.rpm",
         "checksum": "sha256:f6df1feba76d87214433eee205e3b99621dcd78b485ed5f99ba2658117786b6c"
       },
-      {
-        "name": "nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "18.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/nftables-0.9.3-18.el8.aarch64.rpm",
-        "checksum": "sha256:80555c598e51ea922b39b36404c95b5ae78cc0a5cdbc157e8b5aac9313cff353"
-      },
       {
         "name": "npth",
         "epoch": 0,
@@ -8767,15 +8608,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-ethtool-0.14-3.el8.aarch64.rpm",
         "checksum": "sha256:4fe7733b93fad52a48d4b47a6dc55582f3cc41fc2074e42a9b39fc5d407df6d3"
       },
-      {
-        "name": "python3-firewall",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "1.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-firewall-0.9.3-1.el8.noarch.rpm",
-        "checksum": "sha256:ecae9d32c793a198399a8642c171b7b57db2a0e35ee704f73a07da759197ae8e"
-      },
       {
         "name": "python3-gobject-base",
         "epoch": 0,
@@ -8911,15 +8743,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-magic-5.33-16.el8.noarch.rpm",
         "checksum": "sha256:8e2c0324789f42ebb6324847249699eb499544a3e6ad67ccd74713b3c1d6ce78"
       },
-      {
-        "name": "python3-nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "18.el8",
-        "arch": "aarch64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-nftables-0.9.3-18.el8.aarch64.rpm",
-        "checksum": "sha256:fdf96973d893b98591cdffd54d8c7336d894785ac80977a1ddddf23ad1d73ad3"
-      },
       {
         "name": "python3-oauthlib",
         "epoch": 0,
@@ -9055,24 +8878,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-six-1.11.0-8.el8.noarch.rpm",
         "checksum": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
       },
-      {
-        "name": "python3-slip",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "11.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-slip-0.6.4-11.el8.noarch.rpm",
-        "checksum": "sha256:7f2436df92ce3dacaf5a52d988e65b2cbfc6af8be917bdc14119940480efd7bb"
-      },
-      {
-        "name": "python3-slip-dbus",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "11.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.5-20210326/Packages/python3-slip-dbus-0.6.4-11.el8.noarch.rpm",
-        "checksum": "sha256:96b090a6696ca4c8b3f701c3a7b95b91c892db389e023c4b2d500a5162e43e8d"
-      },
       {
         "name": "python3-subscription-manager-rhsm",
         "epoch": 0,
@@ -10031,17 +9836,6 @@
     },
     "bootloader": "unknown",
     "bootmenu": [
-      {
-        "grub_arg": "--unrestricted",
-        "grub_class": "kernel",
-        "grub_users": "$grub_users",
-        "id": "rhel-20210322162557-0-rescue-ffffffffffffffffffffffffffffffff",
-        "initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
-        "linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "$kernelopts",
-        "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 8.5 (Ootpa)",
-        "version": "0-rescue-ffffffffffffffffffffffffffffffff"
-      },
       {
         "grub_arg": "--unrestricted",
         "grub_class": "kernel",
@@ -10055,11 +9849,6 @@
       }
     ],
     "default-target": "multi-user.target",
-    "firewall-enabled": [
-      "ssh",
-      "dhcpv6-client",
-      "cockpit"
-    ],
     "fstab": [
       [
         "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
@@ -10201,7 +9990,6 @@
       "dosfstools-4.1-6.el8.aarch64",
       "dracut-049-135.git20210121.el8.aarch64",
       "dracut-config-generic-049-135.git20210121.el8.aarch64",
-      "dracut-config-rescue-049-135.git20210121.el8.aarch64",
       "dracut-network-049-135.git20210121.el8.aarch64",
       "dracut-squash-049-135.git20210121.el8.aarch64",
       "e2fsprogs-1.45.6-1.el8.aarch64",
@@ -10219,8 +10007,6 @@
       "file-libs-5.33-16.el8.aarch64",
       "filesystem-3.8-3.el8.aarch64",
       "findutils-4.6.0-20.el8.aarch64",
-      "firewalld-0.9.3-1.el8.noarch",
-      "firewalld-filesystem-0.9.3-1.el8.noarch",
       "freetype-2.9.1-4.el8_3.1.aarch64",
       "fuse-libs-2.9.7-12.el8.aarch64",
       "fwupd-1.5.5-3.el8.aarch64",
@@ -10260,10 +10046,6 @@
       "initscripts-10.00.15-1.el8.aarch64",
       "insights-client-3.1.1-1.el8_3.noarch",
       "iproute-5.9.0-4.el8.aarch64",
-      "ipset-7.1-1.el8.aarch64",
-      "ipset-libs-7.1-1.el8.aarch64",
-      "iptables-1.8.4-17.el8.aarch64",
-      "iptables-ebtables-1.8.4-17.el8.aarch64",
       "iptables-libs-1.8.4-17.el8.aarch64",
       "iputils-20180629-7.el8.aarch64",
       "irqbalance-1.4.0-6.el8.aarch64",
@@ -10339,10 +10121,7 @@
       "libmodulemd-2.9.4-2.el8.aarch64",
       "libmount-2.32.1-27.el8.aarch64",
       "libndp-1.7-4.el8.aarch64",
-      "libnetfilter_conntrack-1.0.6-5.el8.aarch64",
-      "libnfnetlink-1.0.1-13.el8.aarch64",
       "libnfsidmap-2.3.3-41.el8.aarch64",
-      "libnftnl-1.1.5-4.el8.aarch64",
       "libnghttp2-1.33.0-3.el8_2.1.aarch64",
       "libnl3-3.5.0-1.el8.aarch64",
       "libnl3-cli-3.5.0-1.el8.aarch64",
@@ -10414,7 +10193,6 @@
       "ncurses-libs-6.1-7.20180224.el8.aarch64",
       "nettle-3.4.1-2.el8.aarch64",
       "newt-0.52.20-11.el8.aarch64",
-      "nftables-0.9.3-18.el8.aarch64",
       "npth-1.5-4.el8.aarch64",
       "nspr-4.25.0-2.el8_2.aarch64",
       "nss-3.53.1-17.el8_3.aarch64",
@@ -10465,7 +10243,6 @@
       "python3-dnf-4.4.2-11.el8.noarch",
       "python3-dnf-plugins-core-4.0.18-4.el8.noarch",
       "python3-ethtool-0.14-3.el8.aarch64",
-      "python3-firewall-0.9.3-1.el8.noarch",
       "python3-gobject-base-3.28.3-2.el8.aarch64",
       "python3-gpg-1.13.1-7.el8.aarch64",
       "python3-hawkey-0.55.0-7.el8.aarch64",
@@ -10486,7 +10263,6 @@
       "python3-linux-procfs-0.6.3-1.el8.noarch",
       "python3-magic-5.33-16.el8.noarch",
       "python3-markupsafe-0.23-19.el8.aarch64",
-      "python3-nftables-0.9.3-18.el8.aarch64",
       "python3-oauthlib-2.1.0-1.el8.noarch",
       "python3-perf-4.18.0-299.1.el8.aarch64",
       "python3-pip-wheel-9.0.3-19.el8.noarch",
@@ -10505,8 +10281,6 @@
       "python3-setools-4.3.0-2.el8.aarch64",
       "python3-setuptools-wheel-39.2.0-6.el8.noarch",
       "python3-six-1.11.0-8.el8.noarch",
-      "python3-slip-0.6.4-11.el8.noarch",
-      "python3-slip-dbus-0.6.4-11.el8.noarch",
       "python3-subscription-manager-rhsm-1.28.13-2.el8.aarch64",
       "python3-syspurpose-1.28.13-2.el8.aarch64",
       "python3-unbound-1.7.3-15.el8.aarch64",
@@ -10695,7 +10469,6 @@
       "cpupower.service",
       "ctrl-alt-del.target",
       "debug-shell.service",
-      "ebtables.service",
       "exit.target",
       "fstrim.timer",
       "fwupd-refresh.timer",
@@ -10707,7 +10480,6 @@
       "mdcheck_continue.timer",
       "mdcheck_start.timer",
       "mdmonitor-oneshot.timer",
-      "nftables.service",
       "nm-cloud-setup.service",
       "nm-cloud-setup.timer",
       "poweroff.target",
@@ -10743,10 +10515,8 @@
       "cloud-init-local.service",
       "cloud-init.service",
       "crond.service",
-      "dbus-org.fedoraproject.FirewallD1.service",
       "dbus-org.freedesktop.nm-dispatcher.service",
       "dnf-makecache.timer",
-      "firewalld.service",
       "getty@.service",
       "import-state.service",
       "irqbalance.service",
diff --git a/test/data/manifests/rhel_85-x86_64-ami-boot.json b/test/data/manifests/rhel_85-x86_64-ami-boot.json
index f9c3ec8d6..282efba2b 100644
--- a/test/data/manifests/rhel_85-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-ami-boot.json
@@ -444,6 +444,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1001,7 +1004,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7389,6 +7393,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10196,7 +10227,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [
diff --git a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
index 241bc7ee1..738a8c33a 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_container-boot.json
@@ -467,7 +467,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
                   "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:761ff1ccc95562a4512c4bea1d4c2b507c42e3805c9e1e0093c80539a954047b",
                   "sha256:4da971c6e5a8a759c919dc9cde21324ee2b309c96b46eb000b4f251a287b08b1",
                   "sha256:482e8619051fd7c027e06c206a016fa53c9b7d49afdc725fd38ff0375ab89318",
@@ -9300,6 +9302,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
       {
         "name": "kernel-core",
         "epoch": 0,
@@ -9309,6 +9320,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
         "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
       },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "keyutils",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_85-x86_64-openstack-boot.json b/test/data/manifests/rhel_85-x86_64-openstack-boot.json
index 891ab077f..04a6c680f 100644
--- a/test/data/manifests/rhel_85-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-openstack-boot.json
@@ -475,6 +475,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1047,7 +1050,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7669,6 +7673,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10575,7 +10606,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [
diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
index 3f58b6b6f..f336ddefe 100644
--- a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json
@@ -467,6 +467,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1061,7 +1064,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7623,6 +7627,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10556,7 +10587,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [
diff --git a/test/data/manifests/rhel_85-x86_64-tar-boot.json b/test/data/manifests/rhel_85-x86_64-tar-boot.json
index df64db900..623f6b199 100644
--- a/test/data/manifests/rhel_85-x86_64-tar-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-tar-boot.json
@@ -408,6 +408,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:4da971c6e5a8a759c919dc9cde21324ee2b309c96b46eb000b4f251a287b08b1",
                   "sha256:482e8619051fd7c027e06c206a016fa53c9b7d49afdc725fd38ff0375ab89318",
                   "sha256:fe6e67b493e34011931b7ce875280d10e27ad8326eec129f5dd935d54b3591bd",
@@ -461,6 +464,7 @@
                   "sha256:0d612ef49922f8eff2d2c96e8da290f77dacf7b667f6b8a9be751bd6394fcf73",
                   "sha256:f6eabee17654187308fd32a13de35b2aa1ca88515c1544af88f63893cb19b048",
                   "sha256:45cc50a8b02f9bbbbe2c8c056f34622d15d383f695916ac07821d688fcab1c25",
+                  "sha256:c6a28277626ee9340db506f0355f7df79a88208a2d5694d972f6a08d1f3a6fbe",
                   "sha256:60c5b5ece7a84f1c5e320b6120b64c176ce4bc48b484b85e20a13cb52ee7db05",
                   "sha256:5d8dc82442f6a87b0878c74c61638c012bf50a23df151a65529b0ae75e6aff82",
                   "sha256:55a58ea1e63e2cc102d82ab4d02e04e90e2c03819b2a2dee74395905868eb5fd",
@@ -5947,6 +5951,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "keyutils-libs",
         "epoch": 0,
@@ -6424,6 +6455,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/libzstd-1.4.4-1.el8.x86_64.rpm",
         "checksum": "sha256:45cc50a8b02f9bbbbe2c8c056f34622d15d383f695916ac07821d688fcab1c25"
       },
+      {
+        "name": "linux-firmware",
+        "epoch": 0,
+        "version": "20201218",
+        "release": "102.git05789708.el8",
+        "arch": "noarch",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/linux-firmware-20201218-102.git05789708.el8.noarch.rpm",
+        "checksum": "sha256:c6a28277626ee9340db506f0355f7df79a88208a2d5694d972f6a08d1f3a6fbe"
+      },
       {
         "name": "lua-libs",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_85-x86_64-vhd-boot.json b/test/data/manifests/rhel_85-x86_64-vhd-boot.json
index 85c4dbddf..41fd435ff 100644
--- a/test/data/manifests/rhel_85-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-vhd-boot.json
@@ -478,6 +478,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1058,7 +1061,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7736,6 +7740,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10624,7 +10655,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [
diff --git a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json b/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
index 245b026a5..2c6ab1a3d 100644
--- a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-vmdk-boot.json
@@ -479,6 +479,9 @@
                   "sha256:25b96d1432d32197ea5d769948649c431d7e289b18d779994d3d75d6f8d8c2a5",
                   "sha256:f0cb56a04fa3b27c1a3bb8896372077234123b36fe3461aca8ddc7b912030ce8",
                   "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73",
+                  "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030",
+                  "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919",
+                  "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09",
                   "sha256:ef5ec76f3187746a32331222ffa93d4afc4b9a47b90a3a777281d102aa7800ac",
                   "sha256:b695f9f1ef86f64fe792dd834f28c8d6f41e3729cc7575cdbaba6c3785b0e3c7",
                   "sha256:fbfd40e61b1951c777727c2cee2e8d3ef2ba336eeff549059d93aa26e940950b",
@@ -1029,7 +1032,8 @@
               "legacy": "i386-pc",
               "uefi": {
                 "vendor": "redhat"
-              }
+              },
+              "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
             }
           }
         ]
@@ -7668,6 +7672,33 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kbd-misc-2.0.4-10.el8.noarch.rpm",
         "checksum": "sha256:a41eef48b706b929464a45a4dbdca5b16201931fe56ff6ada4da0157db5e4b73"
       },
+      {
+        "name": "kernel",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:db7f1994b69ce440f735d4b0f27559ec7d24c3854430fa421d16d8c4923f9030"
+      },
+      {
+        "name": "kernel-core",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-core-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:c041e58f61d656217780ecbe249c50b1ab49ad05360b13ad385b78d728b38919"
+      },
+      {
+        "name": "kernel-modules",
+        "epoch": 0,
+        "version": "4.18.0",
+        "release": "299.1.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.5-20210326/Packages/kernel-modules-4.18.0-299.1.el8.x86_64.rpm",
+        "checksum": "sha256:fa67e890954229371abd6fe8b59dd888fc36c93fe6c4613e6bdb300376d5bd09"
+      },
       {
         "name": "kernel-tools",
         "epoch": 0,
@@ -10294,7 +10325,8 @@
       "70-persistent-ipoib.rules": []
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0"
+      "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0",
+      "saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.x86_64"
     },
     "bootloader": "grub",
     "bootmenu": [