Repository: osbuild/osbuild-composer
Pull request #1182 (2021-01-27 12:17:38)

Rhel84 add missing packages
The packages in the last imagefactory nightly differ from ours. The
following packages are now added:

oddjob
oddjob-mkhomedir
psmisc
authselect-compat
rng-tools
dbxtool

Also, the rngd and nfs-convert services are enabled.

This PR addresses issues listed in #1176 


This pull request includes:

- [ ] adequate testing for the new functionality or fixed issue
- [ ] adequate documentation informing people about the change

jkozol: > Very nice! Are these all the ones you want to add, or a partial list? Will there also be follow-ups to remove some? I see in the ticket there are plenty more, but I guess many/most/all will be pulled in as deps of these?

@teg These are all the packages that I want to add. I will create separate PRs for enabling/disabling services and for removing packages (aka as adding them to our list of excluded packages)
jkozol: Also, is it okay to merge this since the test failures are unrelated to the changes? 
teg: Yeah, if the failures are caused by flaky infrastructure, leave a brief comment about what's going on and why it is unrelated, then we can merge.
jkozol: The tests are failing due to issues with openstack being overloaded. This is not related to this rhel 8.4 specific PR.

Patch:
diff --git a/docs/news/unreleased/rhel84-differences-fixed.md b/docs/news/unreleased/rhel84-differences-fixed.md
new file mode 100644
index 000000000..3c3169bb6
--- /dev/null
+++ b/docs/news/unreleased/rhel84-differences-fixed.md
@@ -0,0 +1,12 @@
+# RHEL 8.4: Update rhel-84 distro to better match imagefactory's qcow2
+
+There are minor discrepancies between our nightly image and the imagefactory's
+qcow2. These differences are mainly in the installed packages, enabled services,
+and disabled services. To remedy these differences the following changes have 
+been made:
+
+The following packages have been added to our qcow2 image: oddjob, 
+oddjob-mkhomedir, psmisc, authselect-compat, rng-tools, dbxtool.
+
+
+The following services have been enabled: rngd.service, nfs-convert.service.
\ No newline at end of file
diff --git a/internal/distro/rhel84/distro.go b/internal/distro/rhel84/distro.go
index 7cd680ced..9fcb043a9 100644
--- a/internal/distro/rhel84/distro.go
+++ b/internal/distro/rhel84/distro.go
@@ -891,42 +891,50 @@ func New() distro.Distro {
 		mimeType: "application/x-qemu-disk",
 		packages: []string{
 			"@core",
+			"authselect-compat",
 			"chrony",
+			"cloud-init",
+			"cloud-utils-growpart",
+			"cockpit-system",
+			"cockpit-ws",
+			"dbxtool",
+			"dhcp-client",
 			"dnf",
+			"dnf-plugin-spacewalk",
+			"dnf-utils",
 			"dosfstools",
+			"dracut-norescue",
+			"insights-client",
 			"kernel",
-			"yum",
+			"NetworkManager",
 			"nfs-utils",
-			"dnf-utils",
-			"cloud-init",
+			"oddjob",
+			"oddjob-mkhomedir",
+			"psmisc",
 			"python3-jsonschema",
 			"qemu-guest-agent",
-			"cloud-utils-growpart",
-			"dracut-norescue",
-			"tar",
-			"tcpdump",
-			"rsync",
-			"dnf-plugin-spacewalk",
-			"NetworkManager",
-			"dhcp-client",
-			"cockpit-ws",
-			"cockpit-system",
-			"subscription-manager-cockpit",
 			"redhat-release",
 			"redhat-release-eula",
-			"insights-client",
-			// TODO: rh-amazon-rhui-client
+			"rsync",
+			"subscription-manager-cockpit",
+			"tar",
+			"tcpdump",
+			"yum",
 		},
 		excludedPackages: []string{
-			"dracut-config-rescue",
 			"aic94xx-firmware",
 			"alsa-firmware",
 			"alsa-lib",
 			"alsa-tools-firmware",
+			"biosdevname",
+			"dracut-config-rescue",
+			"fedora-release",
+			"fedora-repos",
 			"firewalld",
+			"iprutils",
 			"ivtv-firmware",
-			"iwl1000-firmware",
 			"iwl100-firmware",
+			"iwl1000-firmware",
 			"iwl105-firmware",
 			"iwl135-firmware",
 			"iwl2000-firmware",
@@ -941,18 +949,16 @@ func New() distro.Distro {
 			"iwl6000g2b-firmware",
 			"iwl6050-firmware",
 			"iwl7260-firmware",
+			"langpacks-*",
+			"langpacks-en",
+			"langpacks-en",
 			"libertas-sd8686-firmware",
 			"libertas-sd8787-firmware",
 			"libertas-usb8388-firmware",
-			"langpacks-*",
-			"langpacks-en",
-			"biosdevname",
 			"plymouth",
-			"iprutils",
-			"langpacks-en",
-			"fedora-release",
-			"fedora-repos",
-			"rng-tools",
+		},
+		enabledServices: []string{
+			"rngd.service",
 		},
 		defaultTarget:           "multi-user.target",
 		kernelOptions:           "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",


Test patch:
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
index 0059c5602..1617af0a0 100644
--- a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
@@ -87,6 +87,9 @@
           "sha256:09fc3154e76c8ee25b3982c15f3bc455017262c3df5af84075859dcbf79e4f82": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/python3-libsemanage-2.9-3.el8.x86_64.rpm"
           },
+          "sha256:0adaf78120709f5e2c6207bdc1efafb309b1fbd4f7405155645d0b266abcc2df": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/oddjob-mkhomedir-0.34.5-4.el8.x86_64.rpm"
+          },
           "sha256:0b26e1715694a85c1aa9b940003c8cddb0bc8de9514434f60a1f2f22c467a121": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/grub2-pc-2.02-90.el8.x86_64.rpm"
           },
@@ -234,6 +237,9 @@
           "sha256:28ccf9ff472c824f6c5a3c2a0c076bfa221b8e48368e43de9b3c2e83d67e8b5d": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/mpfr-3.1.6-1.el8.x86_64.rpm"
           },
+          "sha256:28ddc63822e22635ea234bfc182976a16441ce6a8ad05966e3618e692f2c105c": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/authselect-compat-1.2.1-2.el8.x86_64.rpm"
+          },
           "sha256:2a65cec3eb67ba7645dd97cf3f3811cd5fb06eea2526d36a683d3fdaa0f2825e": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/cronie-anacron-1.5.2-4.el8.x86_64.rpm"
           },
@@ -390,6 +396,9 @@
           "sha256:4476a92d949229c4eba1fc216356971c400dfcafb7004ad2d321aa9190b34260": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/sssd-nfs-idmap-2.3.0-9.el8.x86_64.rpm"
           },
+          "sha256:45146c375eb639749ed4da202b2b006fce609d585f8125fe8295481a5ef3d07a": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/oddjob-0.34.5-4.el8.x86_64.rpm"
+          },
           "sha256:45cc50a8b02f9bbbbe2c8c056f34622d15d383f695916ac07821d688fcab1c25": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/libzstd-1.4.4-1.el8.x86_64.rpm"
           },
@@ -831,6 +840,9 @@
           "sha256:9d2a2ef762444163e91c433c83ce91ef37acb2318ba168a81ac0dd4d65b834ef": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/subscription-manager-1.27.16-1.el8.x86_64.rpm"
           },
+          "sha256:9d9d1bdfba4cd852f90232ebe2c4247e7b3a88c4476578c820788a91d6838e55": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/rng-tools-6.8-3.el8.x86_64.rpm"
+          },
           "sha256:9e08c0338eac83abf9a0118cb05fb646d4554c1b2513ab6801e9587aede40b28": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/python3-babel-2.5.1-5.el8.noarch.rpm"
           },
@@ -1224,6 +1236,9 @@
           "sha256:e1b2922991a12bcfd754c77baf6278f6f7c91bde603fe67dbd480ac4cf26147c": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/libsmartcols-2.32.1-24.el8.x86_64.rpm"
           },
+          "sha256:e22840ee14aa1993e75fd690749c01dbb7d4419c2b210fef173ff99a76f61ff6": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/psmisc-23.1-5.el8.x86_64.rpm"
+          },
           "sha256:e233a9ecfbf657192902180f6a67a225e5ec0194834df672eaeb2b3a50e8fb49": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/info-6.5-6.el8.x86_64.rpm"
           },
@@ -2941,6 +2956,9 @@
               {
                 "checksum": "sha256:49646b15bc83441dad756598083137562b7b06fe6d88249141b6e3006f703797"
               },
+              {
+                "checksum": "sha256:e22840ee14aa1993e75fd690749c01dbb7d4419c2b210fef173ff99a76f61ff6"
+              },
               {
                 "checksum": "sha256:f8c191d8b952621d10a1055be960bbe07be66f557c5a9d007f8908abcde1b9af"
               },
@@ -3112,6 +3130,9 @@
               {
                 "checksum": "sha256:9be187fd62ada3a61cb494a383b8a60fd6c705c93897a13051600dbbeb1d914f"
               },
+              {
+                "checksum": "sha256:9d9d1bdfba4cd852f90232ebe2c4247e7b3a88c4476578c820788a91d6838e55"
+              },
               {
                 "checksum": "sha256:ad060f60303b6764e08657436147cc24cfc4bb1ccc1431796407ba005a7bcec0"
               },
@@ -3277,6 +3298,9 @@
               {
                 "checksum": "sha256:1594afba86593ec614299ef6af255755a98ea55a34a72a22fdc9d80a040be39d"
               },
+              {
+                "checksum": "sha256:28ddc63822e22635ea234bfc182976a16441ce6a8ad05966e3618e692f2c105c"
+              },
               {
                 "checksum": "sha256:7d0bc4f2f78166013ef160ed10930a4902c7c5c6d6b7940fc900d36eaacc65a2"
               },
@@ -3331,6 +3355,12 @@
               {
                 "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
               },
+              {
+                "checksum": "sha256:45146c375eb639749ed4da202b2b006fce609d585f8125fe8295481a5ef3d07a"
+              },
+              {
+                "checksum": "sha256:0adaf78120709f5e2c6207bdc1efafb309b1fbd4f7405155645d0b266abcc2df"
+              },
               {
                 "checksum": "sha256:7bb63c8b955ff7f993877c0323e8bc17c6d85c7a8e844db9e9980a9ca7a227c5"
               },
@@ -3490,6 +3520,9 @@
         {
           "name": "org.osbuild.systemd",
           "options": {
+            "enabled_services": [
+              "rngd.service"
+            ],
             "default_target": "multi-user.target"
           }
         },
@@ -8068,6 +8101,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/procps-ng-3.3.15-3.el8.x86_64.rpm",
         "checksum": "sha256:49646b15bc83441dad756598083137562b7b06fe6d88249141b6e3006f703797"
       },
+      {
+        "name": "psmisc",
+        "epoch": 0,
+        "version": "23.1",
+        "release": "5.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/psmisc-23.1-5.el8.x86_64.rpm",
+        "checksum": "sha256:e22840ee14aa1993e75fd690749c01dbb7d4419c2b210fef173ff99a76f61ff6"
+      },
       {
         "name": "publicsuffix-list-dafsa",
         "epoch": 0,
@@ -8581,6 +8623,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/rhsm-icons-1.27.16-1.el8.noarch.rpm",
         "checksum": "sha256:9be187fd62ada3a61cb494a383b8a60fd6c705c93897a13051600dbbeb1d914f"
       },
+      {
+        "name": "rng-tools",
+        "epoch": 0,
+        "version": "6.8",
+        "release": "3.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/rng-tools-6.8-3.el8.x86_64.rpm",
+        "checksum": "sha256:9d9d1bdfba4cd852f90232ebe2c4247e7b3a88c4476578c820788a91d6838e55"
+      },
       {
         "name": "rootfiles",
         "epoch": 0,
@@ -9076,6 +9127,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/abattis-cantarell-fonts-0.0.25-4.el8.noarch.rpm",
         "checksum": "sha256:1594afba86593ec614299ef6af255755a98ea55a34a72a22fdc9d80a040be39d"
       },
+      {
+        "name": "authselect-compat",
+        "epoch": 0,
+        "version": "1.2.1",
+        "release": "2.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/authselect-compat-1.2.1-2.el8.x86_64.rpm",
+        "checksum": "sha256:28ddc63822e22635ea234bfc182976a16441ce6a8ad05966e3618e692f2c105c"
+      },
       {
         "name": "cairo",
         "epoch": 0,
@@ -9238,6 +9298,24 @@
         "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/libxkbcommon-0.9.1-1.el8.x86_64.rpm",
         "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
       },
+      {
+        "name": "oddjob",
+        "epoch": 0,
+        "version": "0.34.5",
+        "release": "4.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/oddjob-0.34.5-4.el8.x86_64.rpm",
+        "checksum": "sha256:45146c375eb639749ed4da202b2b006fce609d585f8125fe8295481a5ef3d07a"
+      },
+      {
+        "name": "oddjob-mkhomedir",
+        "epoch": 0,
+        "version": "0.34.5",
+        "release": "4.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/oddjob-mkhomedir-0.34.5-4.el8.x86_64.rpm",
+        "checksum": "sha256:0adaf78120709f5e2c6207bdc1efafb309b1fbd4f7405155645d0b266abcc2df"
+      },
       {
         "name": "pinentry",
         "epoch": 0,
@@ -9596,6 +9674,7 @@
       "polkitd:x:996:",
       "redhat:x:1000:",
       "render:x:998:",
+      "rngd:x:988:",
       "root:x:0:",
       "rpc:x:32:",
       "rpcuser:x:29:",
@@ -9649,6 +9728,7 @@
       "audit-3.0-0.17.20191104git1c2f876.el8.x86_64",
       "audit-libs-3.0-0.17.20191104git1c2f876.el8.x86_64",
       "authselect-1.2.1-2.el8.x86_64",
+      "authselect-compat-1.2.1-2.el8.x86_64",
       "authselect-libs-1.2.1-2.el8.x86_64",
       "basesystem-11-5.el8.noarch",
       "bash-4.4.19-12.el8.x86_64",
@@ -9918,6 +9998,8 @@
       "nfs-utils-2.3.3-35.el8.x86_64",
       "npth-1.5-4.el8.x86_64",
       "numactl-libs-2.0.12-11.el8.x86_64",
+      "oddjob-0.34.5-4.el8.x86_64",
+      "oddjob-mkhomedir-0.34.5-4.el8.x86_64",
       "openldap-2.4.46-16.el8.x86_64",
       "openssh-8.0p1-5.el8.x86_64",
       "openssh-clients-8.0p1-5.el8.x86_64",
@@ -9949,6 +10031,7 @@
       "popt-1.16-14.el8.x86_64",
       "prefixdevname-0.1.0-6.el8.x86_64",
       "procps-ng-3.3.15-3.el8.x86_64",
+      "psmisc-23.1-5.el8.x86_64",
       "publicsuffix-list-dafsa-20180723-1.el8.noarch",
       "python3-asn1crypto-0.24.0-3.el8.noarch",
       "python3-audit-3.0-0.17.20191104git1c2f876.el8.x86_64",
@@ -10029,6 +10112,7 @@
       "redhat-release-eula-8.4-0.5.el8.x86_64",
       "rhn-client-tools-2.8.16-13.module+el8.1.0+3455+3ddf2832.x86_64",
       "rhsm-icons-1.27.16-1.el8.noarch",
+      "rng-tools-6.8-3.el8.x86_64",
       "rootfiles-8.1-22.el8.noarch",
       "rpcbind-1.2.5-7.el8.x86_64",
       "rpm-4.14.3-4.el8.x86_64",
@@ -10140,6 +10224,7 @@
       "operator:x:11:0:operator:/root:/sbin/nologin",
       "polkitd:x:998:996:User for polkitd:/:/sbin/nologin",
       "redhat:x:1000:1000::/home/redhat:/bin/bash",
+      "rngd:x:991:988:Random Number Generator Daemon:/var/lib/rngd:/sbin/nologin",
       "root:x:0:0:root:/root:/bin/bash",
       "rpc:x:32:32:Rpcbind Daemon:/var/lib/rpcbind:/sbin/nologin",
       "rpcuser:x:29:29:RPC Service User:/var/lib/nfs:/sbin/nologin",
@@ -10187,6 +10272,7 @@
       "kexec.target",
       "nfs-blkmap.service",
       "nfs-server.service",
+      "oddjobd.service",
       "poweroff.target",
       "qemu-guest-agent.service",
       "rdisc.service",
@@ -10194,6 +10280,7 @@
       "remote-cryptsetup.target",
       "rhsm-facts.service",
       "rhsm.service",
+      "rngd-wake-threshold.service",
       "runlevel0.target",
       "runlevel6.target",
       "serial-getty@.service",
@@ -10236,6 +10323,7 @@
       "nis-domainname.service",
       "remote-fs.target",
       "rhsmcertd.service",
+      "rngd.service",
       "rpcbind.service",
       "rpcbind.socket",
       "rsyslog.service",
@@ -10250,4 +10338,4 @@
     ],
     "timezone": "New_York"
   }
-}
+}
\ No newline at end of file
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-customize.json b/test/data/manifests/rhel_84-x86_64-qcow2-customize.json
index 40085ba3e..38a3a0aa5 100644
--- a/test/data/manifests/rhel_84-x86_64-qcow2-customize.json
+++ b/test/data/manifests/rhel_84-x86_64-qcow2-customize.json
@@ -139,6 +139,9 @@
           "sha256:09fc3154e76c8ee25b3982c15f3bc455017262c3df5af84075859dcbf79e4f82": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/python3-libsemanage-2.9-3.el8.x86_64.rpm"
           },
+          "sha256:0adaf78120709f5e2c6207bdc1efafb309b1fbd4f7405155645d0b266abcc2df": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/oddjob-mkhomedir-0.34.5-4.el8.x86_64.rpm"
+          },
           "sha256:0b26e1715694a85c1aa9b940003c8cddb0bc8de9514434f60a1f2f22c467a121": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/grub2-pc-2.02-90.el8.x86_64.rpm"
           },
@@ -286,6 +289,9 @@
           "sha256:28ccf9ff472c824f6c5a3c2a0c076bfa221b8e48368e43de9b3c2e83d67e8b5d": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/mpfr-3.1.6-1.el8.x86_64.rpm"
           },
+          "sha256:28ddc63822e22635ea234bfc182976a16441ce6a8ad05966e3618e692f2c105c": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/authselect-compat-1.2.1-2.el8.x86_64.rpm"
+          },
           "sha256:2a65cec3eb67ba7645dd97cf3f3811cd5fb06eea2526d36a683d3fdaa0f2825e": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/cronie-anacron-1.5.2-4.el8.x86_64.rpm"
           },
@@ -442,6 +448,9 @@
           "sha256:4476a92d949229c4eba1fc216356971c400dfcafb7004ad2d321aa9190b34260": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/sssd-nfs-idmap-2.3.0-9.el8.x86_64.rpm"
           },
+          "sha256:45146c375eb639749ed4da202b2b006fce609d585f8125fe8295481a5ef3d07a": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/oddjob-0.34.5-4.el8.x86_64.rpm"
+          },
           "sha256:45cc50a8b02f9bbbbe2c8c056f34622d15d383f695916ac07821d688fcab1c25": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/libzstd-1.4.4-1.el8.x86_64.rpm"
           },
@@ -883,6 +892,9 @@
           "sha256:9d2a2ef762444163e91c433c83ce91ef37acb2318ba168a81ac0dd4d65b834ef": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/subscription-manager-1.27.16-1.el8.x86_64.rpm"
           },
+          "sha256:9d9d1bdfba4cd852f90232ebe2c4247e7b3a88c4476578c820788a91d6838e55": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/rng-tools-6.8-3.el8.x86_64.rpm"
+          },
           "sha256:9e08c0338eac83abf9a0118cb05fb646d4554c1b2513ab6801e9587aede40b28": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/python3-babel-2.5.1-5.el8.noarch.rpm"
           },
@@ -1276,6 +1288,9 @@
           "sha256:e1b2922991a12bcfd754c77baf6278f6f7c91bde603fe67dbd480ac4cf26147c": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/libsmartcols-2.32.1-24.el8.x86_64.rpm"
           },
+          "sha256:e22840ee14aa1993e75fd690749c01dbb7d4419c2b210fef173ff99a76f61ff6": {
+            "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/psmisc-23.1-5.el8.x86_64.rpm"
+          },
           "sha256:e233a9ecfbf657192902180f6a67a225e5ec0194834df672eaeb2b3a50e8fb49": {
             "url": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/info-6.5-6.el8.x86_64.rpm"
           },
@@ -2993,6 +3008,9 @@
               {
                 "checksum": "sha256:49646b15bc83441dad756598083137562b7b06fe6d88249141b6e3006f703797"
               },
+              {
+                "checksum": "sha256:e22840ee14aa1993e75fd690749c01dbb7d4419c2b210fef173ff99a76f61ff6"
+              },
               {
                 "checksum": "sha256:f8c191d8b952621d10a1055be960bbe07be66f557c5a9d007f8908abcde1b9af"
               },
@@ -3164,6 +3182,9 @@
               {
                 "checksum": "sha256:9be187fd62ada3a61cb494a383b8a60fd6c705c93897a13051600dbbeb1d914f"
               },
+              {
+                "checksum": "sha256:9d9d1bdfba4cd852f90232ebe2c4247e7b3a88c4476578c820788a91d6838e55"
+              },
               {
                 "checksum": "sha256:ad060f60303b6764e08657436147cc24cfc4bb1ccc1431796407ba005a7bcec0"
               },
@@ -3329,6 +3350,9 @@
               {
                 "checksum": "sha256:1594afba86593ec614299ef6af255755a98ea55a34a72a22fdc9d80a040be39d"
               },
+              {
+                "checksum": "sha256:28ddc63822e22635ea234bfc182976a16441ce6a8ad05966e3618e692f2c105c"
+              },
               {
                 "checksum": "sha256:7d0bc4f2f78166013ef160ed10930a4902c7c5c6d6b7940fc900d36eaacc65a2"
               },
@@ -3383,6 +3407,12 @@
               {
                 "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
               },
+              {
+                "checksum": "sha256:45146c375eb639749ed4da202b2b006fce609d585f8125fe8295481a5ef3d07a"
+              },
+              {
+                "checksum": "sha256:0adaf78120709f5e2c6207bdc1efafb309b1fbd4f7405155645d0b266abcc2df"
+              },
               {
                 "checksum": "sha256:7bb63c8b955ff7f993877c0323e8bc17c6d85c7a8e844db9e9980a9ca7a227c5"
               },
@@ -3584,6 +3614,7 @@
           "name": "org.osbuild.systemd",
           "options": {
             "enabled_services": [
+              "rngd.service",
               "sshd.socket"
             ],
             "disabled_services": [
@@ -8167,6 +8198,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/procps-ng-3.3.15-3.el8.x86_64.rpm",
         "checksum": "sha256:49646b15bc83441dad756598083137562b7b06fe6d88249141b6e3006f703797"
       },
+      {
+        "name": "psmisc",
+        "epoch": 0,
+        "version": "23.1",
+        "release": "5.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/psmisc-23.1-5.el8.x86_64.rpm",
+        "checksum": "sha256:e22840ee14aa1993e75fd690749c01dbb7d4419c2b210fef173ff99a76f61ff6"
+      },
       {
         "name": "publicsuffix-list-dafsa",
         "epoch": 0,
@@ -8680,6 +8720,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/rhsm-icons-1.27.16-1.el8.noarch.rpm",
         "checksum": "sha256:9be187fd62ada3a61cb494a383b8a60fd6c705c93897a13051600dbbeb1d914f"
       },
+      {
+        "name": "rng-tools",
+        "epoch": 0,
+        "version": "6.8",
+        "release": "3.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-baseos-8.4.0.n-20201010/Packages/rng-tools-6.8-3.el8.x86_64.rpm",
+        "checksum": "sha256:9d9d1bdfba4cd852f90232ebe2c4247e7b3a88c4476578c820788a91d6838e55"
+      },
       {
         "name": "rootfiles",
         "epoch": 0,
@@ -9175,6 +9224,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/abattis-cantarell-fonts-0.0.25-4.el8.noarch.rpm",
         "checksum": "sha256:1594afba86593ec614299ef6af255755a98ea55a34a72a22fdc9d80a040be39d"
       },
+      {
+        "name": "authselect-compat",
+        "epoch": 0,
+        "version": "1.2.1",
+        "release": "2.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/authselect-compat-1.2.1-2.el8.x86_64.rpm",
+        "checksum": "sha256:28ddc63822e22635ea234bfc182976a16441ce6a8ad05966e3618e692f2c105c"
+      },
       {
         "name": "cairo",
         "epoch": 0,
@@ -9337,6 +9395,24 @@
         "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/libxkbcommon-0.9.1-1.el8.x86_64.rpm",
         "checksum": "sha256:25b13ea50e21233dc5fccf42da344fbf24605dde38db9b94e49739ae39faa072"
       },
+      {
+        "name": "oddjob",
+        "epoch": 0,
+        "version": "0.34.5",
+        "release": "4.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/oddjob-0.34.5-4.el8.x86_64.rpm",
+        "checksum": "sha256:45146c375eb639749ed4da202b2b006fce609d585f8125fe8295481a5ef3d07a"
+      },
+      {
+        "name": "oddjob-mkhomedir",
+        "epoch": 0,
+        "version": "0.34.5",
+        "release": "4.el8",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v1/psi/el8/el8-x86_64-appstream-8.4.0.n-20201010/Packages/oddjob-mkhomedir-0.34.5-4.el8.x86_64.rpm",
+        "checksum": "sha256:0adaf78120709f5e2c6207bdc1efafb309b1fbd4f7405155645d0b266abcc2df"
+      },
       {
         "name": "pinentry",
         "epoch": 0,
@@ -9696,6 +9772,7 @@
       "nobody:x:65534:",
       "polkitd:x:996:",
       "render:x:998:",
+      "rngd:x:988:",
       "root:x:0:",
       "rpc:x:32:",
       "rpcuser:x:29:",
@@ -9750,6 +9827,7 @@
       "audit-3.0-0.17.20191104git1c2f876.el8.x86_64",
       "audit-libs-3.0-0.17.20191104git1c2f876.el8.x86_64",
       "authselect-1.2.1-2.el8.x86_64",
+      "authselect-compat-1.2.1-2.el8.x86_64",
       "authselect-libs-1.2.1-2.el8.x86_64",
       "basesystem-11-5.el8.noarch",
       "bash-4.4.19-12.el8.x86_64",
@@ -10019,6 +10097,8 @@
       "nfs-utils-2.3.3-35.el8.x86_64",
       "npth-1.5-4.el8.x86_64",
       "numactl-libs-2.0.12-11.el8.x86_64",
+      "oddjob-0.34.5-4.el8.x86_64",
+      "oddjob-mkhomedir-0.34.5-4.el8.x86_64",
       "openldap-2.4.46-16.el8.x86_64",
       "openssh-8.0p1-5.el8.x86_64",
       "openssh-clients-8.0p1-5.el8.x86_64",
@@ -10050,6 +10130,7 @@
       "popt-1.16-14.el8.x86_64",
       "prefixdevname-0.1.0-6.el8.x86_64",
       "procps-ng-3.3.15-3.el8.x86_64",
+      "psmisc-23.1-5.el8.x86_64",
       "publicsuffix-list-dafsa-20180723-1.el8.noarch",
       "python3-asn1crypto-0.24.0-3.el8.noarch",
       "python3-audit-3.0-0.17.20191104git1c2f876.el8.x86_64",
@@ -10130,6 +10211,7 @@
       "redhat-release-eula-8.4-0.5.el8.x86_64",
       "rhn-client-tools-2.8.16-13.module+el8.1.0+3455+3ddf2832.x86_64",
       "rhsm-icons-1.27.16-1.el8.noarch",
+      "rng-tools-6.8-3.el8.x86_64",
       "rootfiles-8.1-22.el8.noarch",
       "rpcbind-1.2.5-7.el8.x86_64",
       "rpm-4.14.3-4.el8.x86_64",
@@ -10240,6 +10322,7 @@
       "nobody:x:65534:65534:Kernel Overflow User:/:/sbin/nologin",
       "operator:x:11:0:operator:/root:/sbin/nologin",
       "polkitd:x:998:996:User for polkitd:/:/sbin/nologin",
+      "rngd:x:991:988:Random Number Generator Daemon:/var/lib/rngd:/sbin/nologin",
       "root:x:0:0:root:/root:/bin/bash",
       "rpc:x:32:32:Rpcbind Daemon:/var/lib/rpcbind:/sbin/nologin",
       "rpcuser:x:29:29:RPC Service User:/var/lib/nfs:/sbin/nologin",
@@ -10290,6 +10373,7 @@
       "kexec.target",
       "nfs-blkmap.service",
       "nfs-server.service",
+      "oddjobd.service",
       "poweroff.target",
       "qemu-guest-agent.service",
       "rdisc.service",
@@ -10297,6 +10381,7 @@
       "remote-cryptsetup.target",
       "rhsm-facts.service",
       "rhsm.service",
+      "rngd-wake-threshold.service",
       "runlevel0.target",
       "runlevel6.target",
       "serial-getty@.service",
@@ -10338,6 +10423,7 @@
       "nis-domainname.service",
       "remote-fs.target",
       "rhsmcertd.service",
+      "rngd.service",
       "rpcbind.service",
       "rpcbind.socket",
       "rsyslog.service",
@@ -10353,4 +10439,4 @@
     ],
     "timezone": "London"
   }
-}
+}
\ No newline at end of file