Test/manifests: update fedora manifests to F41

Update the fedora manifest template to F41. This is a preparation for
testing a new `org.osbuild.dnf5.sbom.spdx` stage. In addition to that,
F39 is already EOL and unsupported, so moving to a newer version is
desirable.

Regenerate all testing manifests.

Notes about specific changes:
 - Remove `pcmciautils` package from ostree manifest, because it has
   been deprecated and it is not available on F41 any more.
 - Add `python3-dnf` package to the Fedora build pipeline. The reason
   is that DNF5 is installed by default since F41 and the module is
   needed to test e.g. `org.osbuild.dnf4.sbom.spdx` or
   `org.osbuild.dnf4.mark` stages.
 - Add `python3-libdnf5` package to the Fedora build pipeline. This is a
   preparation for testing a new `org.osbuild.dnf5.sbom.spdx` stage.
 - Install `pam` in `authselect` stage test manifest, because otherwise
   authselect fails on the nonexistence of /etc/pam.d.
 - Adjust the `dnf4.mark` test case to also accept `dnf5` as the marked
   package, because on F41, `dnf` is a virtual provide of it.
 - Adjust stage tests and their diffs as needed.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>

test/data/manifests/fedora-build-v2.ipp.yaml

@@ -24,7 +24,9 @@ pipelines:
                 - gdisk
                 - grub2-pc
                 - policycoreutils
+                - python3-dnf
                 - python3-iniparse
+                - python3-libdnf5
                 - python3-toml
                 - python3-yaml
                 - qemu-img

test/data/manifests/fedora-ostree-bootiso-xz.mpp.yaml

@@ -263,7 +263,6 @@ pipelines:
                 - mt-st
                 - smartmontools
                 - hdparm
-                - pcmciautils
                 - libmlx4
                 - rdma-core
                 - rng-tools

test/data/manifests/fedora-ostree-bootiso.mpp.yaml

@@ -263,7 +263,6 @@ pipelines:
                 - mt-st
                 - smartmontools
                 - hdparm
-                - pcmciautils
                 - libmlx4
                 - rdma-core
                 - rng-tools

test/data/manifests/fedora-vars.ipp.yaml

@@ -2,10 +2,10 @@ version: '2'
 
 mpp-vars:
   arch: x86_64
-  release: 39
+  release: 41
   releasever: f$release
-  snapshot: '20231109'
-  updates: '20240508'
+  snapshot: '20241107'
+  updates: '20241107'
   ref: fedora/$arch/osbuild
   isolabel: Fedora-$release-X86_64
   repos:
@@ -14,4 +14,4 @@ mpp-vars:
     - id: updates
       baseurl: https://rpmrepo.osbuild.org/v2/mirror/public/$releasever/$releasever-$arch-updates-released-$updates/
   gpgkeys:
-    - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGLykg8BEADURjKtgQpQNoluifXia+U3FuqGCTQ1w7iTqx1UvNhLX6tb9Qjy\nl/vjl1iXxucrd2JBnrT/21BdtaABhu2hPy7bpcGEkG8MDinAMZBzcyzHcS/JiGHZ\nd/YmMWQUgbDlApbxFSGWiXMgT0Js5QdcywHI5oiCmV0lkZ+khZ4PkVWmk6uZgYWf\nJOG5wp5TDPnoYXlA4CLb6hu2691aDm9b99XYqEjhbeIzS9bFQrdrQzRMKyzLr8NW\ns8Pq2tgyzu8txlWdBXJyAMKldTPstqtygLL9UUdo7CIQQzWqeDbAnv+WdOmiI/hR\netbbwNV+thkLJz0WD90C2L3JEeUJX5Qa4oPvfNLDeCKmJFEFUTCEdm0AYoQDjLJQ\n3d3q9M09thXO/jYM0cSnJDclssLNsNWfjJAerLadLwNnYRuralw7f74QSLYdJAJU\nSFShBlctWKnlhQ7ehockqtgXtWckkqPZZjGiMXwHde9b9Yyi+VqtUQWxSWny+9g9\n6tcoa3AdnmpqSTHQxYajD0EGXJ0z0NXfqxkI0lo8UxzypEBy4sARZ4XhTU73Zwk0\nLGhEUHlfyxXgRs6RRvM2UIoo+gou2M9rn/RWkhuHJNSfgrM0BmIBCjhjwGiS33Qh\nysLDWJMdch8lsu1fTmLEFQrOB93oieOJQ0Ysi5gQY8TOT+oZvVi9pSMJuwARAQAB\ntDFGZWRvcmEgKDM5KSA8ZmVkb3JhLTM5LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEE6PI5lvIyGGQMtEy+dc9axBi450wFAmLykg8CGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQdc9axBi450yd4w//ZtghbZX5KFstOdBS\nrcbBfCK9zmRvzeejzGl6lPKfqwx7OOHYxFlRa9MYLl8QG7Aq6yRRWzzEHiSb0wJw\nWXz5tbkAmV/fpS4wnb3FDArD44u317UAnaU+UlhgK1g62lwI2dGpvTSvohMBMeBY\nB5aBd+sLi3UtiSRM2XhxvxaWwr/oFLjKDukgrPQzeV3F/XdxGhSz/GZUVFVprcrB\nh/dIo4k0Za7YVRhlVM0coOIcKbcjxAK9CCZ8+jtdIh3/BN5zJ0RFMgqSsrWYWeft\nBI3KWLbyMfRwEtp7xSi17WXbRfsSoqwIVgP+RCSaAdVuiYs/GCRsT3ydYcDvutuJ\nYZoE53yczemM/1HZZFI04zI7KBsKm9NFH0o4K2nBWuowBm59iFvWHFpX6em54cq4\n45NwY01FkSQUqntfqCWFSowwFHAZM4gblOikq2B5zHoIntCiJlPGuaJiVSw9ZpEc\n+IEQfmXJjKGSkMbU9tmNfLR9skVQJizMTtoUQ12DWC+14anxnnR2hxnhUDAabV6y\nJ5dGeb/ArmxQj3IMrajdNwjuk9GMeMSSS2EMY8ryOuYwRbFhBOLhGAnmM5OOSUxv\nA4ipWraXDW0bK/wXI7yHMkc6WYrdV3SIXEqJBTp7npimv3JC+exWEbTLcgvV70FP\nX55M9nDtzUSayJuEcfFP2c9KQCE=\n=J4qZ\n-----END PGP PUBLIC KEY BLOCK-----\n"
+    - "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGTSYSwBEACTHP7OFONk+1B1awJeYToUFMVbYZIjNvj9M7zwf5vzH52FlpXX\ndsbs1AWh6NUe0zV1J5JjCGiI24Vjacysg7L2zsbgT48vVv3mXrXorjYOzT/cxsAh\n7PNhEx+OevKzAx3oy0Ok27c11Dz0W4ynwVy80gB6XHI2rd04v74TiC0xQYlxj1Sh\nj6irdLmHMD/NtTCWmCM7MRf91UcC4rk6JOap715UKey2fk1h/wylv0guMP3o+CpG\njxDHENkfl/GsWCSYBaHec7o5/qg5RoAkN5NImVI00CqiEO1WHPBaCJalgwbuQCiW\n006jwVDHJHRoufS85PEKaY9yqd5Fr76kdqCLsf3Ys9yxGVfOTvCaKOa+ElWBo+i6\nyOtEO6Qp1Qd5spomBJ+FVPjU89lR9aDnvxIVX7X6zu638qV0K3Lb2HKmqiVG6ccJ\nIdxNVXJAekvu7ypwvRzEc0mGgfkZ47flaj7X8SxiebbXhYWdqRBF0rMYc7ppkbCp\n5NsD+KJilkfeOGb7VK6Rx5vXmySiNCb9GqN51KRl4Z1qllrc/Q1k5CCMt3AUq0hv\n1fwK3eFGtd4/YgF9LoZ0tW8WFZ6h/zWnRvJ/SDBPhtovoSpxptCd18MWiakwvwW0\nsxueKFlctdDjW1a/gri3V4RdTOZbr0AqDjGGcYndt/oxMeLxaK9qvs2xIQARAQAB\ntDFGZWRvcmEgKDQxKSA8ZmVkb3JhLTQxLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEERmzy2LYLwwV6qUU+0GIkYumdatEFAmTSYSwCGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ0GIkYumdatFHIQ//bTSVGDvJGmUxgHJw\nMnGM2G6Rc9PNAKuXbh6t4qsrRKp22pWNnMmqqcGaoiBxKP989a2cJgIVP49SsC4C\newaafEYhsitUtKagx6z3F7UObnvQpOz5U5iFcJCvRDtC4FXq+VkMdhT09zMZY4Ey\nia29bV1B1R7pe7yXh6l3WyVj9AAXUSEBR/OsakaYEMzScLnROBEU1YbWR9iHsc7M\nrEsqju8tVUh1XAqIqJgLW3VrKs0g0nDVR0rBc8aDhrtVfylwWVl61gHsPFJfAkjj\nOPgvQgThrhlCWo23EZSk/Hj8YRrnhUbEDnk+Z3Xv5Uyl1kxGRk5dGBnv+7u3CKvV\nG6sU3tPtna/8rFblfKSMZIPhzTADdsUZ88Fn9pZkfqgPi8LZ4sS8vHtaykZmbfj6\nt9a2mBYJQ+/pxiH8olzyhKMdNyesLPeQmESgwM/qlJ+b2Hbogwuuzp8o2JMezxIe\nCAwLoPh+hxMPGnBRklh6Vj5R5z29wIZd6pKCavVRfJ+ON94wuOSEofhBfQNZIIFV\njagEbk60iksysxsObfVEHFhtGnZCEgCRC87BfX6tzIIDv23Zs4Bv9gcaaRXTAml2\nkZXktduHkV9q3hhcoha5FgGSe244C4GsMUkWCsZtuN6tevUPo+n2ZZAA7ikQ768r\nIz9rPOI8/Ra7qnwSlNIVnkTb9bc=\n=e2ew\n-----END PGP PUBLIC KEY BLOCK-----\n"

test/data/stages/authselect/a.mpp.yaml

@@ -22,6 +22,7 @@ pipelines:
                 mpp-eval: repos
               packages:
                 - authselect
+                - pam
         options:
           gpgkeys:
             mpp-eval: gpgkeys

test/data/stages/authselect/b.mpp.yaml

@@ -22,6 +22,7 @@ pipelines:
                 mpp-eval: repos
               packages:
                 - authselect
+                - pam
         options:
           gpgkeys:
             mpp-eval: gpgkeys

test/data/stages/authselect/diff.json

@@ -4,31 +4,19 @@
   "differences": {
     "/etc/authselect/authselect.conf": {
       "content": [
-        "sha256:55eee183988be83f2c7867cdb7c29bba9f8d879cf7dc915a5c6cfd7f3fc56adb",
+        "sha256:30769ce03a7df14c85a46254f196a769d2dfc1fa7c9dafcd558a04f872a480d7",
         "sha256:21d9b04b621411419ae5469fd0b69aa87cf0c21ed8c7033d767472d2d9d07b5e"
       ]
     },
-    "/etc/authselect/dconf-db": {
-      "content": [
-        "sha256:3143cf0884f874c12b6e12181829514ca86c65c29c3c5c106af95614e0191cea",
-        "sha256:559565d5f87ab929c50ca3773ec7b6e30522f494424ae037608fe92829959e5f"
-      ]
-    },
-    "/etc/authselect/dconf-locks": {
-      "content": [
-        "sha256:7b0ab1525a0e52dbf02045126b351b89fd0c99aceded6862c322b83b9c1cbdee",
-        "sha256:5dc7ba629a423616341432b2eafa00b851f2a0159e1a2b1c07f160070a34923e"
-      ]
-    },
     "/etc/authselect/nsswitch.conf": {
       "content": [
-        "sha256:2a942b72d330a4ab98c460c088a0dfd69caefe2d1406ae3727fdcdf83f1b2b14",
-        "sha256:a03bba2dd4c31446b3955075600bc8a35f5cdccb79c3cb87844b6a716e753c17"
+        "sha256:72873504fa9f732dda7ba92dee085230aa6b8fcb8a35ee02012e99e00db6901c",
+        "sha256:b937fe168a986798d2b32069e468c8a9a70368580e0aa775189fb7b3a4d1ca48"
       ]
     },
     "/etc/authselect/password-auth": {
       "content": [
-        "sha256:adf5dcbbd3e196b4eb80058e3d721e8c762f6f39630673767259e69da50759a5",
+        "sha256:2e53f704372b6c7fb69cdc4dfd6c27456d642c83feff8b1588fa1f9cb1126cd0",
         "sha256:79fa077e26ecb548d2cd1140cec4763ffbe69141ebde732e01cd7978cc096046"
       ]
     },
@@ -40,7 +28,7 @@
     },
     "/etc/authselect/system-auth": {
       "content": [
-        "sha256:adf5dcbbd3e196b4eb80058e3d721e8c762f6f39630673767259e69da50759a5",
+        "sha256:2e53f704372b6c7fb69cdc4dfd6c27456d642c83feff8b1588fa1f9cb1126cd0",
         "sha256:79fa077e26ecb548d2cd1140cec4763ffbe69141ebde732e01cd7978cc096046"
       ]
     }

test/data/stages/chrony-servers/diff.json

@@ -4,8 +4,8 @@
   "differences": {
     "/etc/chrony.conf": {
       "content": [
-        "sha256:48c980b52637cd7c495682040485d1597e90947753b5288c92a85835cc36dcf1",
-        "sha256:c99f4b9c82952ebcec9b4ba70728a722eb4b65385333e6e701c65014b42a2889"
+        "sha256:204145d4e6cdbb720012175d1ad0209d5f618055d906ed651f883370cce915b0",
+        "sha256:3bcb4f7abd478143f967387aa7bfd8304fa78e3acc62c52e276ec6cc842279b8"
       ]
     }
   }

test/data/stages/chrony/diff.json

@@ -4,8 +4,8 @@
   "differences": {
     "/etc/chrony.conf": {
       "content": [
-        "sha256:48c980b52637cd7c495682040485d1597e90947753b5288c92a85835cc36dcf1",
-        "sha256:955a1628f4931e977a8893ca6d425baa3763e491c1fb0d32ee42c0d2667bae61"
+        "sha256:204145d4e6cdbb720012175d1ad0209d5f618055d906ed651f883370cce915b0",
+        "sha256:9afbf4d52438f25af8fd74e6a9ee41c61e266505e83063ad894376b710496746"
       ]
     }
   }

test/data/stages/copy/diff.json

@@ -16,7 +16,7 @@
     },
     "/usr/lib/os-release": {
       "content": [
-        "sha256:125ed26603dabd0f76eb0e8bc44e90fd60940640ec5dbf4ea100c443d6eb15cf",
+        "sha256:c86515afc2a6e3ff53101f21a039b1ba520cf046ac20029c7789c7bab750afe4",
         "sha256:0e55092af0746630c98d1b2e0d960617c33f8ea7b55739fd18cb7cd5342a28ca"
       ]
     },

test/data/stages/dnf-automatic.config/diff.json

@@ -1,12 +1,7 @@
 {
-  "added_files": [],
+  "added_files": [
+    "/etc/dnf/automatic.conf"
+  ],
   "deleted_files": [],
-  "differences": {
-    "/etc/dnf/automatic.conf": {
-      "content": [
-        "sha256:7050ddbd618cbc3818b13c31d5e1b288b3f3f1f90ebbc86c22f4b436fa061006",
-        "sha256:215141ef5722d3225c6bc19a0c086918b0c90cb9faa512b6241a66dfe2c51c49"
-      ]
-    }
-  }
+  "differences": {}
 }

test/data/stages/dnf.config/diff.json

@@ -6,8 +6,8 @@
   "differences": {
     "/etc/dnf/dnf.conf": {
       "content": [
-        "sha256:59535af5e9f33197ed15a2d4ce1970d0ddf7018fb23e522f29924ca3cf3136be",
-        "sha256:3b3e48b78770b2a33fc93ea09bf314b9c2a7acb5ed74d402b857288a8c88a2af"
+        "sha256:bb898f90ae1b05d5f389be84a2c318f6482acd5fd87431f2b7a727bb731a2360",
+        "sha256:550bc0e31f83de9e848be20ff1c270c85ae937c4aea191d1b24e650ea02d1202"
       ]
     }
   }

test/data/stages/dracut/vanilla.json

@@ -1,5 +1,5 @@
 {
-  "initramfs-6.8.8-200.fc39.x86_64.img": {
+  "initramfs-6.11.6-300.fc41.x86_64.img": {
     "early_cpio": false,
     "compression": "gzip",
     "kmods": [
@@ -11,7 +11,6 @@
       "8250_lpss.ko.xz",
       "9p.ko.xz",
       "9pnet.ko.xz",
-      "BusLogic.ko.xz",
       "a100u2w.ko.xz",
       "aacraid.ko.xz",
       "acard-ahci.ko.xz",
@@ -35,9 +34,9 @@
       "ansi_cprng.ko.xz",
       "aoe.ko.xz",
       "applespi.ko.xz",
+      "arcmsr.ko.xz",
       "arc_ps2.ko.xz",
       "arc_uart.ko.xz",
-      "arcmsr.ko.xz",
       "asus-wmi.ko.xz",
       "async_memcpy.ko.xz",
       "async_pq.ko.xz",
@@ -49,44 +48,46 @@
       "atmel-i2c.ko.xz",
       "atmel-sha204a.ko.xz",
       "atp870u.ko.xz",
-      "bcache.ko.xz",
       "bcachefs.ko.xz",
+      "bcache.ko.xz",
       "bfa.ko.xz",
       "binfmt_misc.ko.xz",
-      "blowfish-x86_64.ko.xz",
       "blowfish_common.ko.xz",
       "blowfish_generic.ko.xz",
+      "blowfish-x86_64.ko.xz",
       "bnx2fc.ko.xz",
+      "BusLogic.ko.xz",
       "cachefiles.ko.xz",
-      "camellia-aesni-avx-x86_64.ko.xz",
       "camellia-aesni-avx2.ko.xz",
-      "camellia-x86_64.ko.xz",
+      "camellia-aesni-avx-x86_64.ko.xz",
       "camellia_generic.ko.xz",
+      "camellia-x86_64.ko.xz",
       "cast5-avx-x86_64.ko.xz",
       "cast5_generic.ko.xz",
       "cast6-avx-x86_64.ko.xz",
       "cast6_generic.ko.xz",
       "cast_common.ko.xz",
-      "cb710-mmc.ko.xz",
       "cb710.ko.xz",
+      "cb710-mmc.ko.xz",
       "ccp-crypto.ko.xz",
-      "ccp.ko.xz",
+      "cdns-pltfrm.ko.xz",
       "ceph.ko.xz",
       "chacha20poly1305.ko.xz",
       "chacha_generic.ko.xz",
       "chcr.ko.xz",
-      "cifs.ko.xz",
       "cifs_arc4.ko.xz",
+      "cifs.ko.xz",
       "cifs_md4.ko.xz",
       "cnic.ko.xz",
       "cqhci.ko.xz",
-      "crc-itu-t.ko.xz",
-      "crc32-pclmul.ko.xz",
-      "crc32_generic.ko.xz",
       "crc32c-intel.ko.xz",
+      "crc32_generic.ko.xz",
+      "crc32-pclmul.ko.xz",
       "crc8.ko.xz",
+      "crc-itu-t.ko.xz",
       "crct10dif-pclmul.ko.xz",
       "cros_ec_keyb.ko.xz",
+      "cros_ec_wdt.ko.xz",
       "crypto_engine.ko.xz",
       "crypto_user.ko.xz",
       "csiostor.ko.xz",
@@ -99,8 +100,8 @@
       "des_generic.ko.xz",
       "dfl.ko.xz",
       "dm-bio-prison.ko.xz",
-      "dm-cache-smq.ko.xz",
       "dm-cache.ko.xz",
+      "dm-cache-smq.ko.xz",
       "dm-clone.ko.xz",
       "dm-crypt.ko.xz",
       "dm-delay.ko.xz",
@@ -122,10 +123,11 @@
       "dm-switch.ko.xz",
       "dm-thin-pool.ko.xz",
       "dm-unstripe.ko.xz",
+      "dm-vdo.ko.xz",
       "dm-verity.ko.xz",
       "dm-writecache.ko.xz",
-      "dm-zoned.ko.xz",
       "dmx3191d.ko.xz",
+      "dm-zoned.ko.xz",
       "dns_resolver.ko.xz",
       "dw_dmac.ko.xz",
       "echainiv.ko.xz",
@@ -159,9 +161,9 @@
       "fuse.ko.xz",
       "ghash-clmulni-intel.ko.xz",
       "governor_simpleondemand.ko.xz",
-      "gpio-sbu-mux.ko.xz",
       "gpio_keys.ko.xz",
       "gpio_keys_polled.ko.xz",
+      "gpio-sbu-mux.ko.xz",
       "grace.ko.xz",
       "hctr2.ko.xz",
       "hd3ss3220.ko.xz",
@@ -170,8 +172,8 @@
       "hid-a4tech.ko.xz",
       "hid-accutouch.ko.xz",
       "hid-alps.ko.xz",
-      "hid-apple.ko.xz",
       "hid-appleir.ko.xz",
+      "hid-apple.ko.xz",
       "hid-asus.ko.xz",
       "hid-aureal.ko.xz",
       "hid-axff.ko.xz",
@@ -201,9 +203,9 @@
       "hid-google-stadiaff.ko.xz",
       "hid-gt683r.ko.xz",
       "hid-gyration.ko.xz",
+      "hid-holtekff.ko.xz",
       "hid-holtek-kbd.ko.xz",
       "hid-holtek-mouse.ko.xz",
-      "hid-holtekff.ko.xz",
       "hid-hyperv.ko.xz",
       "hid-icade.ko.xz",
       "hid-ite.ko.xz",
@@ -234,9 +236,9 @@
       "hid-penmount.ko.xz",
       "hid-petalynx.ko.xz",
       "hid-picolcd.ko.xz",
-      "hid-pl.ko.xz",
       "hid-plantronics.ko.xz",
       "hid-playstation.ko.xz",
+      "hid-pl.ko.xz",
       "hid-primax.ko.xz",
       "hid-prodikeys.ko.xz",
       "hid-pxrc.ko.xz",
@@ -250,11 +252,11 @@
       "hid-roccat-koneplus.ko.xz",
       "hid-roccat-konepure.ko.xz",
       "hid-roccat-kovaplus.ko.xz",
+      "hid-roccat.ko.xz",
       "hid-roccat-lua.ko.xz",
       "hid-roccat-pyra.ko.xz",
       "hid-roccat-ryos.ko.xz",
       "hid-roccat-savu.ko.xz",
-      "hid-roccat.ko.xz",
       "hid-saitek.ko.xz",
       "hid-samsung.ko.xz",
       "hid-semitek.ko.xz",
@@ -280,6 +282,7 @@
       "hid-vivaldi.ko.xz",
       "hid-waltop.ko.xz",
       "hid-wiimote.ko.xz",
+      "hid-winwing.ko.xz",
       "hid-xiaomi.ko.xz",
       "hid-xinmo.ko.xz",
       "hid-zpff.ko.xz",
@@ -294,23 +297,21 @@
       "i2c-hid.ko.xz",
       "i6300esb.ko.xz",
       "i82092.ko.xz",
-      "iTCO_vendor_support.ko.xz",
-      "iTCO_wdt.ko.xz",
       "iaa_crypto.ko.xz",
       "ib700wdt.ko.xz",
       "ib_cm.ko.xz",
       "ib_core.ko.xz",
-      "ib_srp.ko.xz",
       "ibmasr.ko.xz",
-      "idxd.ko.xz",
+      "ib_srp.ko.xz",
       "idxd_bus.ko.xz",
+      "idxd.ko.xz",
       "ie6xx_wdt.ko.xz",
       "industrialio.ko.xz",
       "initio.ko.xz",
       "intel-ish-ipc.ko.xz",
       "intel-ishtp-hid.ko.xz",
-      "intel-ishtp-loader.ko.xz",
       "intel-ishtp.ko.xz",
+      "intel-ishtp-loader.ko.xz",
       "intel_pmc_bxt.ko.xz",
       "intel_pmc_mux.ko.xz",
       "intel_qat.ko.xz",
@@ -320,8 +321,11 @@
       "isci.ko.xz",
       "iscsi_boot_sysfs.ko.xz",
       "isofs.ko.xz",
+      "it5205.ko.xz",
       "it8712f_wdt.ko.xz",
       "it87_wdt.ko.xz",
+      "iTCO_vendor_support.ko.xz",
+      "iTCO_wdt.ko.xz",
       "iw_cm.ko.xz",
       "jffs2.ko.xz",
       "jfs.ko.xz",
@@ -330,7 +334,7 @@
       "keywrap.ko.xz",
       "lcd.ko.xz",
       "led-class-multicolor.ko.xz",
-      "ledtrig-audio.ko.xz",
+      "lenovo_se10_wdt.ko.xz",
       "libahci_platform.ko.xz",
       "libceph.ko.xz",
       "libcurve25519-generic.ko.xz",
@@ -342,22 +346,22 @@
       "libsas.ko.xz",
       "loop.ko.xz",
       "lpfc.ko.xz",
-      "lz4.ko.xz",
       "lz4_compress.ko.xz",
-      "lz4hc.ko.xz",
       "lz4hc_compress.ko.xz",
+      "lz4hc.ko.xz",
+      "lz4.ko.xz",
       "mac-celtic.ko.xz",
       "mac-centeuro.ko.xz",
       "mac-croatian.ko.xz",
       "mac-cyrillic.ko.xz",
       "mac-gaelic.ko.xz",
       "mac-greek.ko.xz",
+      "machzwd.ko.xz",
       "mac-iceland.ko.xz",
       "mac-inuit.ko.xz",
-      "mac-roman.ko.xz",
       "mac-romanian.ko.xz",
+      "mac-roman.ko.xz",
       "mac-turkish.ko.xz",
-      "machzwd.ko.xz",
       "matrix-keymap.ko.xz",
       "md4.ko.xz",
       "megaraid.ko.xz",
@@ -381,9 +385,9 @@
       "mptspi.ko.xz",
       "msdos.ko.xz",
       "mspro_block.ko.xz",
-      "mtd.ko.xz",
       "mtd_blkdevs.ko.xz",
       "mtdblock.ko.xz",
+      "mtd.ko.xz",
       "mtip32xx.ko.xz",
       "mvsas.ko.xz",
       "mvumi.ko.xz",
@@ -397,8 +401,8 @@
       "nfit.ko.xz",
       "nfs_acl.ko.xz",
       "nhpoly1305-avx2.ko.xz",
-      "nhpoly1305-sse2.ko.xz",
       "nhpoly1305.ko.xz",
+      "nhpoly1305-sse2.ko.xz",
       "nic7018_wdt.ko.xz",
       "nls_cp1250.ko.xz",
       "nls_cp1251.ko.xz",
@@ -423,10 +427,10 @@
       "nls_cp949.ko.xz",
       "nls_cp950.ko.xz",
       "nls_euc-jp.ko.xz",
-      "nls_iso8859-1.ko.xz",
       "nls_iso8859-13.ko.xz",
       "nls_iso8859-14.ko.xz",
       "nls_iso8859-15.ko.xz",
+      "nls_iso8859-1.ko.xz",
       "nls_iso8859-2.ko.xz",
       "nls_iso8859-3.ko.xz",
       "nls_iso8859-4.ko.xz",
@@ -441,7 +445,6 @@
       "nls_utf8.ko.xz",
       "ntfs3.ko.xz",
       "null_blk.ko.xz",
-      "nv_tco.ko.xz",
       "nvme-auth.ko.xz",
       "nvme-core.ko.xz",
       "nvme-fabrics.ko.xz",
@@ -450,6 +453,7 @@
       "nvme.ko.xz",
       "nvmet-fc.ko.xz",
       "nvmet.ko.xz",
+      "nv_tco.ko.xz",
       "orangefs.ko.xz",
       "overlay.ko.xz",
       "padlock-aes.ko.xz",
@@ -477,8 +481,8 @@
       "pata_ns87410.ko.xz",
       "pata_ns87415.ko.xz",
       "pata_oldpiix.ko.xz",
-      "pata_opti.ko.xz",
       "pata_optidma.ko.xz",
+      "pata_opti.ko.xz",
       "pata_pcmcia.ko.xz",
       "pata_pdc2027x.ko.xz",
       "pata_pdc202xx_old.ko.xz",
@@ -535,8 +539,8 @@
       "qat_c62xvf.ko.xz",
       "qat_dh895xcc.ko.xz",
       "qat_dh895xccvf.ko.xz",
-      "qed.ko.xz",
       "qedf.ko.xz",
+      "qed.ko.xz",
       "qemu_fw_cfg.ko.xz",
       "qla1280.ko.xz",
       "qla2xxx.ko.xz",
@@ -544,8 +548,8 @@
       "qt1050.ko.xz",
       "qt1070.ko.xz",
       "raid0.ko.xz",
-      "raid1.ko.xz",
       "raid10.ko.xz",
+      "raid1.ko.xz",
       "raid456.ko.xz",
       "raid6test.ko.xz",
       "raid_class.ko.xz",
@@ -559,6 +563,7 @@
       "rmd160.ko.xz",
       "rmi_core.ko.xz",
       "rnbd-client.ko.xz",
+      "rnull_mod.ko.xz",
       "romfs.ko.xz",
       "rt1719.ko.xz",
       "rtrs-client.ko.xz",
@@ -573,8 +578,8 @@
       "sata_nv.ko.xz",
       "sata_promise.ko.xz",
       "sata_qstor.ko.xz",
-      "sata_sil.ko.xz",
       "sata_sil24.ko.xz",
+      "sata_sil.ko.xz",
       "sata_sis.ko.xz",
       "sata_svw.ko.xz",
       "sata_sx4.ko.xz",
@@ -582,7 +587,9 @@
       "sata_via.ko.xz",
       "sata_vsc.ko.xz",
       "sbc_fitpc2_wdt.ko.xz",
+      "sc16is7xx_i2c.ko.xz",
       "sc16is7xx.ko.xz",
+      "sc16is7xx_spi.ko.xz",
       "sch311x_wdt.ko.xz",
       "scsi_debug.ko.xz",
       "scsi_dh_alua.ko.xz",
@@ -594,30 +601,31 @@
       "scsi_transport_spi.ko.xz",
       "scsi_transport_srp.ko.xz",
       "sdhci-acpi.ko.xz",
+      "sdhci.ko.xz",
       "sdhci-pci.ko.xz",
       "sdhci-pltfm.ko.xz",
       "sdhci-xenon-driver.ko.xz",
-      "sdhci.ko.xz",
       "sdricoh_cs.ko.xz",
       "serial_cs.ko.xz",
       "serio_raw.ko.xz",
-      "serpent-avx-x86_64.ko.xz",
       "serpent-avx2.ko.xz",
-      "serpent-sse2-x86_64.ko.xz",
+      "serpent-avx-x86_64.ko.xz",
       "serpent_generic.ko.xz",
+      "serpent-sse2-x86_64.ko.xz",
       "serport.ko.xz",
       "sha1-ssse3.ko.xz",
       "sha256-ssse3.ko.xz",
       "sha512-ssse3.ko.xz",
       "smartpqi.ko.xz",
+      "snd.ko.xz",
       "snd-rawmidi.ko.xz",
       "snd-seq-device.ko.xz",
-      "snd.ko.xz",
       "snic.ko.xz",
       "softdog.ko.xz",
       "soundcore.ko.xz",
       "sp5100_tco.ko.xz",
       "sparse-keymap.ko.xz",
+      "spi-pxa2xx-core.ko.xz",
       "spi-pxa2xx-platform.ko.xz",
       "squashfs.ko.xz",
       "stex.ko.xz",
@@ -625,8 +633,9 @@
       "stusb160x.ko.xz",
       "sunrpc.ko.xz",
       "surface_aggregator.ko.xz",
-      "surface_hid.ko.xz",
+      "surface_aggregator_registry.ko.xz",
       "surface_hid_core.ko.xz",
+      "surface_hid.ko.xz",
       "surface_kbd.ko.xz",
       "sym53c8xx.ko.xz",
       "target_core_mod.ko.xz",
@@ -640,15 +649,25 @@
       "tls.ko.xz",
       "tm2-touchkey.ko.xz",
       "toshsd.ko.xz",
+      "tpm_atmel.ko.xz",
+      "tpm_i2c_atmel.ko.xz",
+      "tpm_i2c_infineon.ko.xz",
+      "tpm_i2c_nuvoton.ko.xz",
+      "tpm_infineon.ko.xz",
+      "tpm_nsc.ko.xz",
+      "tpm_tis_i2c_cr50.ko.xz",
+      "tpm_tis_i2c.ko.xz",
+      "tpm_tis_spi.ko.xz",
+      "tpm_vtpm_proxy.ko.xz",
       "tps6598x.ko.xz",
       "tqmx86_wdt.ko.xz",
       "twofish-avx-x86_64.ko.xz",
-      "twofish-x86_64-3way.ko.xz",
-      "twofish-x86_64.ko.xz",
       "twofish_common.ko.xz",
       "twofish_generic.ko.xz",
-      "typec.ko.xz",
+      "twofish-x86_64-3way.ko.xz",
+      "twofish-x86_64.ko.xz",
       "typec_displayport.ko.xz",
+      "typec.ko.xz",
       "typec_nvidia.ko.xz",
       "typec_ucsi.ko.xz",
       "typec_wcove.ko.xz",
@@ -660,6 +679,8 @@
       "udf.ko.xz",
       "udp_tunnel.ko.xz",
       "ufshcd-core.ko.xz",
+      "ufshcd-pci.ko.xz",
+      "ufshcd-pltfrm.ko.xz",
       "uhid.ko.xz",
       "uio.ko.xz",
       "ums-alauda.ko.xz",
@@ -687,11 +708,11 @@
       "virtio_blk.ko.xz",
       "virtio_console.ko.xz",
       "virtio_crypto.ko.xz",
+      "virtiofs.ko.xz",
       "virtio_mem.ko.xz",
       "virtio_mmio.ko.xz",
       "virtio_scsi.ko.xz",
       "virtio_vdpa.ko.xz",
-      "virtiofs.ko.xz",
       "vmac.ko.xz",
       "vmd.ko.xz",
       "vmw_pvscsi.ko.xz",
@@ -719,27 +740,40 @@
       "zstd.ko.xz"
     ],
     "modules": [
-      "systemd",
-      "systemd-initrd",
-      "i18n",
+      "base",
       "crypt",
       "dm",
+      "dracut-systemd",
+      "fido2",
+      "fs-lib",
+      "i18n",
       "kernel-modules",
       "kernel-modules-extra",
-      "nvdimm",
-      "qemu",
       "lunmask",
+      "memstrack",
+      "nvdimm",
+      "pcmcia",
+      "pkcs11",
+      "qemu",
       "resume",
       "rootfs-block",
+      "shutdown",
+      "systemd",
+      "systemd-ask-password",
+      "systemd-cryptsetup",
+      "systemd-initrd",
+      "systemd-journald",
+      "systemd-modules-load",
+      "systemd-pcrphase",
+      "systemd-sysctl",
+      "systemd-sysusers",
+      "systemd-tmpfiles",
+      "systemd-udevd",
       "terminfo",
+      "tpm2-tss",
       "udev-rules",
-      "virtiofs",
-      "dracut-systemd",
       "usrmount",
-      "base",
-      "fs-lib",
-      "memstrack",
-      "shutdown"
+      "virtiofs"
     ]
   }
 }

test/data/stages/groups/diff.json

@@ -8,14 +8,14 @@
   "differences": {
     "/etc/group": {
       "content": [
-        "sha256:5be46faf83078411c18ce0f3cb5e5fc5b56b8cb214a7f5a65dbbef6cb8249e16",
-        "sha256:c8ff04219026d32fbeca942b5493d7571f03f09c0b68d72c99258b7ac99375f7"
+        "sha256:1664e398cb8dca0e1cbc46668fc906130f54c12fc84c20a8f0229bd7bdf6ac1c",
+        "sha256:889ae43a4e72bacc786d96d5abf684e1b6ee66374745be4665f77bce9198236f"
       ]
     },
     "/etc/gshadow": {
       "content": [
-        "sha256:50b56bf2e0d5dd28900aa04478a9d4cc2ca1ea3452a76a71c71b5ade7f2221cd",
-        "sha256:334a86faab6df7cb8425b413f0000da3fb7732ef98b5f5aaacf9712392f4f2ae"
+        "sha256:825bf1abf0aab3239e88a3c37dc1040297266dcf794cb3ac0ab225103d053b60",
+        "sha256:9dc641c396ed6276fb1a2c8534737a96d627884a5ec08108b74a86be830fadae"
       ]
     }
   }

test/data/stages/grub2.legacy/diff.json

@@ -223,6 +223,7 @@
     "/boot/grub2/i386-pc/pcidump.mod",
     "/boot/grub2/i386-pc/pgp.mod",
     "/boot/grub2/i386-pc/pkcs1_v15.mod",
+    "/boot/grub2/i386-pc/plainmount.mod",
     "/boot/grub2/i386-pc/plan9.mod",
     "/boot/grub2/i386-pc/play.mod",
     "/boot/grub2/i386-pc/png.mod",