manifest/os: move fs tool selection into the pipeline

Always include the tools for all the filesystem types in the partition table. There may be usecases for having additional ones, for instance if the partition table is not known, but this gives us a minimal baseline. This includes dosfstools in images that have a vfat partition but did not include the tools.
2022-07-06 10:13:45 +01:00 · 2022-07-06 10:13:45 +01:00 · 39c3d6ec35
commit 39c3d6ec35
parent d791138b27
33 changed files with 591 additions and 4 deletions
--- a/internal/distro/fedora/package_sets.go
+++ b/internal/distro/fedora/package_sets.go
@ -18,7 +18,6 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
 			"chrony",
 			"langpacks-en",
 			"libxcrypt-compat",
-			"xfsprogs",
 			"cloud-init",
 			"checkpolicy",
 			"net-tools",
--- a/internal/manifest/os.go
+++ b/internal/manifest/os.go
@ -133,19 +133,49 @@ func (p *OSPipeline) getPackageSetChain() []rpmmd.PackageSet {
 	// If we have a logical volume we need to include the lvm2 package
 	if p.PartitionTable != nil && p.OSTree == nil {
 		hasLVM := false
+		hasBtrfs := false
+		hasXFS := false
+		hasFAT := false
+		hasEXT4 := false

-		isLVM := func(e disk.Entity, path []disk.Entity) error {
-			switch e.(type) {
+		introspectPT := func(e disk.Entity, path []disk.Entity) error {
+			switch ent := e.(type) {
 			case *disk.LVMLogicalVolume:
 				hasLVM = true
+			case *disk.Btrfs:
+				hasBtrfs = true
+			case *disk.Filesystem:
+				switch ent.GetFSType() {
+				case "vfat":
+					hasFAT = true
+				case "btrfs":
+					hasBtrfs = true
+				case "xfs":
+					hasXFS = true
+				case "ext4":
+					hasEXT4 = true
+				}
 			}
 			return nil
 		}
-		_ = p.PartitionTable.ForEachEntity(isLVM)
+		_ = p.PartitionTable.ForEachEntity(introspectPT)

+		// TODO: LUKS
 		if hasLVM {
 			packages = append(packages, "lvm2")
 		}
+		if hasBtrfs {
+			packages = append(packages, "btrfs-progs")
+		}
+		if hasXFS {
+			packages = append(packages, "xfsprogs")
+		}
+		if hasFAT {
+			packages = append(packages, "dosfstools")
+		}
+		if hasEXT4 {
+			packages = append(packages, "e2fsprogs")
+		}
 	}

 	if len(p.NTPServers) > 0 {
--- a/test/data/manifests/fedora_34-aarch64-ami-boot.json
+++ b/test/data/manifests/fedora_34-aarch64-ami-boot.json
@ -1985,6 +1985,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:3886bb4c2cfad25ceaf8665461d8dce8ff4ba8912c30e906ab45581a483581fd",
                    "options": {
@ -8401,6 +8409,16 @@
        "checksum": "sha256:9fb2f80cae183c988781cc298cc8414b1cb4a79affc99ae32e0db63242c08fb2",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-aarch64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.aarch64.rpm",
+        "checksum": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-aarch64-oci-boot.json
+++ b/test/data/manifests/fedora_34-aarch64-oci-boot.json
@ -2025,6 +2025,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:3886bb4c2cfad25ceaf8665461d8dce8ff4ba8912c30e906ab45581a483581fd",
                    "options": {
@ -8363,6 +8371,16 @@
        "checksum": "sha256:9fb2f80cae183c988781cc298cc8414b1cb4a79affc99ae32e0db63242c08fb2",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-aarch64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.aarch64.rpm",
+        "checksum": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-aarch64-openstack-boot.json
+++ b/test/data/manifests/fedora_34-aarch64-openstack-boot.json
@ -2002,6 +2002,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:3886bb4c2cfad25ceaf8665461d8dce8ff4ba8912c30e906ab45581a483581fd",
                    "options": {
@ -8663,6 +8671,16 @@
        "checksum": "sha256:9fb2f80cae183c988781cc298cc8414b1cb4a79affc99ae32e0db63242c08fb2",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-aarch64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.aarch64.rpm",
+        "checksum": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-aarch64-qcow2-boot.json
+++ b/test/data/manifests/fedora_34-aarch64-qcow2-boot.json
@ -2039,6 +2039,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:3886bb4c2cfad25ceaf8665461d8dce8ff4ba8912c30e906ab45581a483581fd",
                    "options": {
@ -8387,6 +8395,16 @@
        "checksum": "sha256:9fb2f80cae183c988781cc298cc8414b1cb4a79affc99ae32e0db63242c08fb2",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-aarch64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.aarch64.rpm",
+        "checksum": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/fedora_34-aarch64-qcow2_customize-boot.json
@ -2097,6 +2097,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:3886bb4c2cfad25ceaf8665461d8dce8ff4ba8912c30e906ab45581a483581fd",
                    "options": {
@ -8708,6 +8716,16 @@
        "checksum": "sha256:9fb2f80cae183c988781cc298cc8414b1cb4a79affc99ae32e0db63242c08fb2",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-aarch64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.aarch64.rpm",
+        "checksum": "sha256:cd1389701cf86cd09b78c8c4dbbf2b37e3a1f7b8ba4e2828e5df995a8095ba38",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-x86_64-ami-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-ami-boot.json
@ -2009,6 +2009,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:377d141bf5e1dca120216e9cc478c31fceace604f0ba2b2bc51497efbf00b7df",
                    "options": {
@ -8434,6 +8442,16 @@
        "checksum": "sha256:c58752e2529cf0ea4aabb0476ef53ca7748091aa936513affc1245928ae5b1b8",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.x86_64.rpm",
+        "checksum": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-x86_64-oci-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-oci-boot.json
@ -2049,6 +2049,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:377d141bf5e1dca120216e9cc478c31fceace604f0ba2b2bc51497efbf00b7df",
                    "options": {
@ -8532,6 +8540,16 @@
        "checksum": "sha256:c58752e2529cf0ea4aabb0476ef53ca7748091aa936513affc1245928ae5b1b8",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.x86_64.rpm",
+        "checksum": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-x86_64-openstack-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-openstack-boot.json
@ -2026,6 +2026,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:377d141bf5e1dca120216e9cc478c31fceace604f0ba2b2bc51497efbf00b7df",
                    "options": {
@ -8766,6 +8774,16 @@
        "checksum": "sha256:c58752e2529cf0ea4aabb0476ef53ca7748091aa936513affc1245928ae5b1b8",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.x86_64.rpm",
+        "checksum": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-x86_64-qcow2-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-qcow2-boot.json
@ -2063,6 +2063,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:377d141bf5e1dca120216e9cc478c31fceace604f0ba2b2bc51497efbf00b7df",
                    "options": {
@ -8556,6 +8564,16 @@
        "checksum": "sha256:c58752e2529cf0ea4aabb0476ef53ca7748091aa936513affc1245928ae5b1b8",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.x86_64.rpm",
+        "checksum": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-qcow2_customize-boot.json
@ -2121,6 +2121,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:377d141bf5e1dca120216e9cc478c31fceace604f0ba2b2bc51497efbf00b7df",
                    "options": {
@ -8877,6 +8885,16 @@
        "checksum": "sha256:c58752e2529cf0ea4aabb0476ef53ca7748091aa936513affc1245928ae5b1b8",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.x86_64.rpm",
+        "checksum": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-x86_64-vhd-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-vhd-boot.json
@ -2007,6 +2007,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:377d141bf5e1dca120216e9cc478c31fceace604f0ba2b2bc51497efbf00b7df",
                    "options": {
@ -8242,6 +8250,16 @@
        "checksum": "sha256:c58752e2529cf0ea4aabb0476ef53ca7748091aa936513affc1245928ae5b1b8",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.x86_64.rpm",
+        "checksum": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_34-x86_64-vmdk-boot.json
+++ b/test/data/manifests/fedora_34-x86_64-vmdk-boot.json
@ -2063,6 +2063,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:377d141bf5e1dca120216e9cc478c31fceace604f0ba2b2bc51497efbf00b7df",
                    "options": {
@ -8555,6 +8563,16 @@
        "checksum": "sha256:c58752e2529cf0ea4aabb0476ef53ca7748091aa936513affc1245928ae5b1b8",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "1.fc34",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/Packages/d/dosfstools-4.2-1.fc34.x86_64.rpm",
+        "checksum": "sha256:509a2067a88eb29ddc4b66078401bbbe6c938c968b876bcb2d74c469e7327fcb",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-aarch64-ami-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-ami-boot.json
@ -2137,6 +2137,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e08085458034dc7dac6708c92ce37e1dc7e6f18b88024216d823ede8bd40ce7b",
                    "options": {
@ -8774,6 +8782,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.aarch64.rpm",
+        "checksum": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-aarch64-oci-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-oci-boot.json
@ -2145,6 +2145,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e08085458034dc7dac6708c92ce37e1dc7e6f18b88024216d823ede8bd40ce7b",
                    "options": {
@ -8762,6 +8770,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.aarch64.rpm",
+        "checksum": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-aarch64-openstack-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-openstack-boot.json
@ -2154,6 +2154,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e08085458034dc7dac6708c92ce37e1dc7e6f18b88024216d823ede8bd40ce7b",
                    "options": {
@ -9036,6 +9044,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.aarch64.rpm",
+        "checksum": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-aarch64-qcow2-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-qcow2-boot.json
@ -2159,6 +2159,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e08085458034dc7dac6708c92ce37e1dc7e6f18b88024216d823ede8bd40ce7b",
                    "options": {
@ -8786,6 +8794,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.aarch64.rpm",
+        "checksum": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json
@ -2217,6 +2217,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e08085458034dc7dac6708c92ce37e1dc7e6f18b88024216d823ede8bd40ce7b",
                    "options": {
@ -9085,6 +9093,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-aarch64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.aarch64.rpm",
+        "checksum": "sha256:c15429541bf1984e507f991adb9c9daf6f9ba7e7ef5d5db34704a072773c994d",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-x86_64-ami-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-ami-boot.json
@ -2161,6 +2161,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e99f5ce0f6d485bb5f8de26507df2a3b93fb5d5f863848f2291b230379a7652c",
                    "options": {
@ -8807,6 +8815,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.x86_64.rpm",
+        "checksum": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-x86_64-oci-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-oci-boot.json
@ -2169,6 +2169,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e99f5ce0f6d485bb5f8de26507df2a3b93fb5d5f863848f2291b230379a7652c",
                    "options": {
@ -8964,6 +8972,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.x86_64.rpm",
+        "checksum": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-x86_64-openstack-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-openstack-boot.json
@ -2178,6 +2178,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e99f5ce0f6d485bb5f8de26507df2a3b93fb5d5f863848f2291b230379a7652c",
                    "options": {
@ -9139,6 +9147,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.x86_64.rpm",
+        "checksum": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-x86_64-qcow2-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-qcow2-boot.json
@ -2183,6 +2183,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e99f5ce0f6d485bb5f8de26507df2a3b93fb5d5f863848f2291b230379a7652c",
                    "options": {
@ -8988,6 +8996,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.x86_64.rpm",
+        "checksum": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json
@ -2241,6 +2241,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e99f5ce0f6d485bb5f8de26507df2a3b93fb5d5f863848f2291b230379a7652c",
                    "options": {
@ -9287,6 +9295,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.x86_64.rpm",
+        "checksum": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-x86_64-vhd-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-vhd-boot.json
@ -2183,6 +2183,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e99f5ce0f6d485bb5f8de26507df2a3b93fb5d5f863848f2291b230379a7652c",
                    "options": {
@ -8623,6 +8631,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.x86_64.rpm",
+        "checksum": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_35-x86_64-vmdk-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-vmdk-boot.json
@ -2183,6 +2183,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:e99f5ce0f6d485bb5f8de26507df2a3b93fb5d5f863848f2291b230379a7652c",
                    "options": {
@ -8987,6 +8995,16 @@
        "checksum": "sha256:a206d0ea77ae99368f6230f0337ffa0b5f4e4549f0d362f55abbae3aaf7e3adc",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "2.fc35",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f35/f35-x86_64-fedora-20220106/Packages/d/dosfstools-4.2-2.fc35.x86_64.rpm",
+        "checksum": "sha256:ecd02f2a2fb547997c394c73642da7322670d4b64f51156f5e31661d61ed16a9",
+        "check_gpg": true
+      },
      {
        "name": "e2fsprogs",
        "epoch": 0,
--- a/test/data/manifests/fedora_36-x86_64-ami-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-ami-boot.json
@ -2209,6 +2209,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:82cdca13a5e2316a3a7531160681641cc656161b11cebcd9198a3adbef155280",
                    "options": {
@ -8896,6 +8904,16 @@
        "checksum": "sha256:2e4be96198f5c29e6e38a9ed3c70a8fb7b23072d4aaecf20c66bf17b0aa523a6",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "3.fc36",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/d/dosfstools-4.2-3.fc36.x86_64.rpm",
+        "checksum": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+        "check_gpg": true
+      },
      {
        "name": "dracut",
        "epoch": 0,
--- a/test/data/manifests/fedora_36-x86_64-oci-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-oci-boot.json
@ -2249,6 +2249,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:82cdca13a5e2316a3a7531160681641cc656161b11cebcd9198a3adbef155280",
                    "options": {
@ -9049,6 +9057,16 @@
        "checksum": "sha256:2e4be96198f5c29e6e38a9ed3c70a8fb7b23072d4aaecf20c66bf17b0aa523a6",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "3.fc36",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/d/dosfstools-4.2-3.fc36.x86_64.rpm",
+        "checksum": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+        "check_gpg": true
+      },
      {
        "name": "dracut",
        "epoch": 0,
--- a/test/data/manifests/fedora_36-x86_64-openstack-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-openstack-boot.json
@ -2234,6 +2234,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:82cdca13a5e2316a3a7531160681641cc656161b11cebcd9198a3adbef155280",
                    "options": {
@ -9238,6 +9246,16 @@
        "checksum": "sha256:2e4be96198f5c29e6e38a9ed3c70a8fb7b23072d4aaecf20c66bf17b0aa523a6",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "3.fc36",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/d/dosfstools-4.2-3.fc36.x86_64.rpm",
+        "checksum": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+        "check_gpg": true
+      },
      {
        "name": "dracut",
        "epoch": 0,
--- a/test/data/manifests/fedora_36-x86_64-qcow2-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-qcow2-boot.json
@ -2263,6 +2263,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:82cdca13a5e2316a3a7531160681641cc656161b11cebcd9198a3adbef155280",
                    "options": {
@ -9073,6 +9081,16 @@
        "checksum": "sha256:2e4be96198f5c29e6e38a9ed3c70a8fb7b23072d4aaecf20c66bf17b0aa523a6",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "3.fc36",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/d/dosfstools-4.2-3.fc36.x86_64.rpm",
+        "checksum": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+        "check_gpg": true
+      },
      {
        "name": "dracut",
        "epoch": 0,
--- a/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json
@ -2351,6 +2351,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:82cdca13a5e2316a3a7531160681641cc656161b11cebcd9198a3adbef155280",
                    "options": {
@ -9626,6 +9634,16 @@
        "checksum": "sha256:2e4be96198f5c29e6e38a9ed3c70a8fb7b23072d4aaecf20c66bf17b0aa523a6",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "3.fc36",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/d/dosfstools-4.2-3.fc36.x86_64.rpm",
+        "checksum": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+        "check_gpg": true
+      },
      {
        "name": "dracut",
        "epoch": 0,
--- a/test/data/manifests/fedora_36-x86_64-vhd-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-vhd-boot.json
@ -2231,6 +2231,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:82cdca13a5e2316a3a7531160681641cc656161b11cebcd9198a3adbef155280",
                    "options": {
@ -8723,6 +8731,16 @@
        "checksum": "sha256:2e4be96198f5c29e6e38a9ed3c70a8fb7b23072d4aaecf20c66bf17b0aa523a6",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "3.fc36",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/d/dosfstools-4.2-3.fc36.x86_64.rpm",
+        "checksum": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+        "check_gpg": true
+      },
      {
        "name": "dracut",
        "epoch": 0,
--- a/test/data/manifests/fedora_36-x86_64-vmdk-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-vmdk-boot.json
@ -2263,6 +2263,14 @@
                      }
                    }
                  },
+                  {
+                    "id": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                  {
                    "id": "sha256:82cdca13a5e2316a3a7531160681641cc656161b11cebcd9198a3adbef155280",
                    "options": {
@ -9072,6 +9080,16 @@
        "checksum": "sha256:2e4be96198f5c29e6e38a9ed3c70a8fb7b23072d4aaecf20c66bf17b0aa523a6",
        "check_gpg": true
      },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "3.fc36",
+        "arch": "x86_64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-rawhide-20220324/Packages/d/dosfstools-4.2-3.fc36.x86_64.rpm",
+        "checksum": "sha256:381b19a26bb015f90280580e6a821505e976ae5f057bf85fed8cca88845cdb77",
+        "check_gpg": true
+      },
      {
        "name": "dracut",
        "epoch": 0,