From eecaf4a6577e0577aa52e4fd3935b81c5e43501b Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 21 Jul 2026 14:13:05 +0200 Subject: [PATCH 1/8] eln: clean up disk definitions Clean up the ELN disk definitions by splitting out the partitions and defining both types of partition tables in use (root is plain XFS without XBOOTLDR, root is LVM with XBOOTLDR). This keeps all the hysterical raisins that are present and thus no checksums change. It might be slightly suboptimal but this reorganization will make the following commits much easier to digest. Signed-off-by: Simon de Vlieger --- data/distrodefs/eln-11/disk.yaml | 300 ++++++++++++++++++------------- 1 file changed, 174 insertions(+), 126 deletions(-) diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index 391e5c6101..3561142666 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -5,60 +5,191 @@ guids: - &bios_boot_partition_guid "21686148-6449-6E6F-744E-656564454649" - &efi_system_partition_guid "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" + - &xbootldr_partition_guid "BC13C2FF-59E6-4262-A352-B275FD6F7172" - &filesystem_data_guid "0FC63DAF-8483-4772-8E79-3D69D8477DE4" - &lvm_partition_guid "E6D6D379-F507-44C2-A23C-238F2A3DF928" - default_partition_tables: &default_partition_tables + # The default partitions used within the partition tables, this allows for slightly + # easier composability in the tables. + default_partitions: + - &default_partition_bios + size: "1 MiB" + bootable: true + type: *bios_boot_partition_guid + - &default_partition_prep + size: "4 MiB" + bootable: true + type: *prep_partition_dosid + - &default_partition_esp + size: "200 MiB" + type: *efi_system_partition_guid + payload_type: "filesystem" + payload: &default_partition_esp_payload + type: vfat + mountpoint: "/boot/efi" + label: "ESP" + fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt" + fstab_freq: 0 + fstab_passno: 2 + - &default_partition_xbootldr + size: "2 GiB" + type: *xbootldr_partition_guid + payload_type: "filesystem" + payload: &default_partition_xbootldr_payload + type: "xfs" + label: "boot" + mountpoint: "/boot" + fstab_options: "defaults" + fstab_freq: 0 + fstab_passno: 0 + - &default_partition_root_xfs + size: "2 GiB" + type: *filesystem_data_guid + payload_type: "filesystem" + payload: &default_partition_root_xfs_payload + type: "xfs" + label: "root" + mountpoint: "/" + fstab_options: "defaults" + fstab_freq: 0 + fstab_passno: 0 + - &default_partition_root_xfs_lvm + size: "2 GiB" + type: *lvm_partition_guid + payload_type: "lvm" + payload: + name: "rootvg" + description: "built with lvm2 and image-builder" + logical_volumes: + - size: "1 GiB" + name: "homelv" + payload_type: "filesystem" + payload: + type: "xfs" + label: "home" + mountpoint: "/home" + fstab_options: "defaults" + - size: "2 GiB" + name: "rootlv" + payload_type: "filesystem" + payload: + type: "xfs" + label: "root" + mountpoint: "/" + fstab_options: "defaults" + - size: "2 GiB" + name: "tmplv" + payload_type: "filesystem" + payload: + type: "xfs" + label: "tmp" + mountpoint: "/tmp" + fstab_options: "defaults" + - size: "10 GiB" + name: "usrlv" + payload_type: "filesystem" + payload: + type: "xfs" + label: "usr" + mountpoint: "/usr" + fstab_options: "defaults" + - size: "10 GiB" + name: "varlv" + payload_type: "filesystem" + payload: + type: "xfs" + label: "var" + mountpoint: "/var" + fstab_options: "defaults" + + # The default partition tables for all images that use a plain XFS root partition. In this + # case there is no separate XBOOTLDR partition. For ppc64le and s390x the respective necessary + # partitions are set. + default_partition_tables_xfs: &default_partition_tables_xfs x86_64: type: "gpt" partitions: - - size: "1 MiB" + - *default_partition_bios + - *default_partition_esp + - *default_partition_root_xfs + aarch64: + type: "gpt" + partitions: + - *default_partition_esp + - *default_partition_root_xfs + ppc64le: + type: "dos" + partitions: + - *default_partition_prep + - <<: *default_partition_root_xfs + type: "" + payload: + <<: *default_partition_root_xfs_payload + label: "" + s390x: + type: "dos" + partitions: + - <<: *default_partition_root_xfs + type: "" bootable: true - type: *bios_boot_partition_guid - - &default_partition_table_part_efi - size: "200 MiB" - type: *efi_system_partition_guid - payload_type: "filesystem" payload: - type: vfat - mountpoint: "/boot/efi" - label: "ESP" - fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt" - fstab_freq: 0 - fstab_passno: 2 - - &default_partition_table_part_root - size: "2 GiB" + <<: *default_partition_root_xfs_payload + label: "" + + # The default partition tables for all images that use a XFS on LVM on the root partition. Note + # that the layout for s390x and ppc64le diverges and that some default partition sizes, labels, + # and types, diverge more than necessary at the moment. + default_partition_tables_xfs_lvm: &default_partition_tables_xfs_lvm + x86_64: &default_partition_tables_xfs_lvm_x86_64 + type: "gpt" + partitions: + - <<: *default_partition_esp + size: "500 MiB" + payload: + <<: *default_partition_esp_payload + label: "" + - <<: *default_partition_xbootldr type: *filesystem_data_guid - payload_type: "filesystem" - payload: &default_partition_table_part_root_payload - type: "xfs" - label: "root" - mountpoint: "/" - fstab_options: "defaults" - fstab_freq: 0 - fstab_passno: 0 - aarch64: + size: "1 GiB" + payload: + <<: *default_partition_xbootldr_payload + label: "" + - <<: *default_partition_bios + size: "2 MiB" + - *default_partition_root_xfs_lvm + aarch64: &default_partition_tables_xfs_lvm_aarch64 type: "gpt" partitions: - - *default_partition_table_part_efi - - *default_partition_table_part_root + - <<: *default_partition_esp + size: "500 MiB" + payload: + <<: *default_partition_esp_payload + label: "" + - <<: *default_partition_xbootldr + type: *filesystem_data_guid + size: "1 GiB" + payload: + <<: *default_partition_xbootldr_payload + label: "" + - *default_partition_root_xfs_lvm ppc64le: type: "dos" partitions: - - size: "4 MiB" - bootable: true - type: *prep_partition_dosid - - &default_partition_table_part_root_ppc64le - size: "2 GiB" - payload_type: "filesystem" + - *default_partition_prep + - <<: *default_partition_root_xfs + type: "" payload: - <<: *default_partition_table_part_root_payload + <<: *default_partition_root_xfs_payload label: "" s390x: type: "dos" partitions: - - <<: *default_partition_table_part_root_ppc64le + - <<: *default_partition_root_xfs + type: "" bootable: true + payload: + <<: *default_partition_root_xfs_payload + label: "" s390x_zipl_platform: &s390x_zipl_platform arch: "s390x" @@ -351,8 +482,7 @@ image_types: enabled: false subscription_manager: enabled: false - partition_table: - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs package_sets: os: - *common_disk_pkgset_exclude @@ -508,8 +638,7 @@ image_types: apply_network_config: false datasource_list: - "Azure" - partition_table: - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs package_sets: os: - *common_disk_pkgset_exclude @@ -522,90 +651,14 @@ image_types: exports: ["xz"] compression: "xz" filename: "disk.vhd.xz" - partition_table: + partition_table: + <<: *default_partition_tables_xfs_lvm x86_64: - type: "gpt" + <<: *default_partition_tables_xfs_lvm_x86_64 size: "64 GiB" - partitions: - - &azure_rhui_part_boot_efi - size: "500 MiB" - type: *efi_system_partition_guid - payload_type: "filesystem" - payload: - type: "vfat" - mountpoint: "/boot/efi" - fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt" - fstab_freq: 0 - fstab_passno: 2 - # NB: we currently don't support /boot on LVM - - &azure_rhui_part_boot - size: "1 GiB" - type: *filesystem_data_guid - payload_type: "filesystem" - payload: - type: "xfs" - mountpoint: "/boot" - fstab_options: "defaults" - fstab_freq: 0 - fstab_passno: 0 - - size: "2 MiB" - bootable: true - type: *bios_boot_partition_guid - - &azure_rhui_part_lvm - type: *lvm_partition_guid - payload_type: "lvm" - payload: - name: "rootvg" - description: "built with lvm2 and osbuild" - logical_volumes: - - size: "1 GiB" - name: "homelv" - payload_type: "filesystem" - payload: - type: "xfs" - label: "home" - mountpoint: "/home" - fstab_options: "defaults" - - size: "2 GiB" - name: "rootlv" - payload_type: "filesystem" - payload: - type: "xfs" - label: "root" - mountpoint: "/" - fstab_options: "defaults" - - size: "2 GiB" - name: "tmplv" - payload_type: "filesystem" - payload: - type: "xfs" - label: "tmp" - mountpoint: "/tmp" - fstab_options: "defaults" - - size: "10 GiB" - name: "usrlv" - payload_type: "filesystem" - payload: - type: "xfs" - label: "usr" - mountpoint: "/usr" - fstab_options: "defaults" - - size: "10 GiB" - name: "varlv" - payload_type: "filesystem" - payload: - type: "xfs" - label: "var" - mountpoint: "/var" - fstab_options: "defaults" aarch64: - type: "gpt" + <<: *default_partition_tables_xfs_lvm_aarch64 size: "64 GiB" - partitions: - - *azure_rhui_part_boot_efi - # NB: we currently don't support /boot on LVM - - *azure_rhui_part_boot - - *azure_rhui_part_lvm blueprint: supported_options: *supported_options_disk @@ -624,8 +677,7 @@ image_types: image_config: kernel_options: - "ro" - partition_table: - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs package_sets: os: - include: @@ -752,8 +804,7 @@ image_types: add_drivers: - "nvme" - "xen-blkfront" - partition_table: - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs package_sets: os: - *common_disk_pkgset_exclude @@ -879,10 +930,7 @@ image_types: config: "InstanceSetup": set_boto_config: false - partition_table: - # TODO: the base partition table still contains the BIOS boot - # partition, but the image is UEFI-only - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs package_sets: os: - include: From 76840e2807999c930315955da80a08940eb4a290 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 21 Jul 2026 14:19:06 +0200 Subject: [PATCH 2/8] eln: align partition sizes across LVM and non-LVM The LVM partition table used on Azure used different partition size for the BIOS boot, ESP, and XBOOTLDR partition from the defaults. Let's share the sizes between both. Signed-off-by: Simon de Vlieger --- data/distrodefs/eln-11/disk.yaml | 7 +------ test/data/manifest-checksums/eln_11-aarch64-azure-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-azure-empty | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index 3561142666..4dc331d87e 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -144,30 +144,25 @@ type: "gpt" partitions: - <<: *default_partition_esp - size: "500 MiB" payload: <<: *default_partition_esp_payload label: "" - <<: *default_partition_xbootldr type: *filesystem_data_guid - size: "1 GiB" payload: <<: *default_partition_xbootldr_payload label: "" - - <<: *default_partition_bios - size: "2 MiB" + - *default_partition_bios - *default_partition_root_xfs_lvm aarch64: &default_partition_tables_xfs_lvm_aarch64 type: "gpt" partitions: - <<: *default_partition_esp - size: "500 MiB" payload: <<: *default_partition_esp_payload label: "" - <<: *default_partition_xbootldr type: *filesystem_data_guid - size: "1 GiB" payload: <<: *default_partition_xbootldr_payload label: "" diff --git a/test/data/manifest-checksums/eln_11-aarch64-azure-empty b/test/data/manifest-checksums/eln_11-aarch64-azure-empty index b928eb8602..d011a3512d 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-azure-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-azure-empty @@ -1 +1 @@ -bb30870b136fb528c07f126aa713fdc49ff8bfbef35c2c8fceb5daa553394bc0 +bdf9fafddb3766d907478a8b2ea29300b37821158e495a77c1820a63b0b89182 diff --git a/test/data/manifest-checksums/eln_11-x86_64-azure-empty b/test/data/manifest-checksums/eln_11-x86_64-azure-empty index a5f161f0aa..1e363fa1de 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-azure-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-azure-empty @@ -1 +1 @@ -3768402c30796c36b493f07f5d97207251bfb15cb8ada628479ce592bda29fea +f8fd359f506644a85a70f5763e8bc1f62244b545ad62bee6956240c5f8e669a0 From 535bd0640a0819ba9f19528c86d6ada2b8d9b838 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 21 Jul 2026 14:22:01 +0200 Subject: [PATCH 3/8] eln: align filesystem labels for LVM and non-LVM The LVM partition tables had no labels on the filesystems for XBOOTLDR and the ESP. Let's share them with the non-LVM partition table instead. Signed-off-by: Simon de Vlieger --- data/distrodefs/eln-11/disk.yaml | 16 ++-------------- .../eln_11-aarch64-azure-empty | 2 +- .../manifest-checksums/eln_11-x86_64-azure-empty | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index 4dc331d87e..9a9995645c 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -143,29 +143,17 @@ x86_64: &default_partition_tables_xfs_lvm_x86_64 type: "gpt" partitions: - - <<: *default_partition_esp - payload: - <<: *default_partition_esp_payload - label: "" + - *default_partition_esp - <<: *default_partition_xbootldr type: *filesystem_data_guid - payload: - <<: *default_partition_xbootldr_payload - label: "" - *default_partition_bios - *default_partition_root_xfs_lvm aarch64: &default_partition_tables_xfs_lvm_aarch64 type: "gpt" partitions: - - <<: *default_partition_esp - payload: - <<: *default_partition_esp_payload - label: "" + - *default_partition_esp - <<: *default_partition_xbootldr type: *filesystem_data_guid - payload: - <<: *default_partition_xbootldr_payload - label: "" - *default_partition_root_xfs_lvm ppc64le: type: "dos" diff --git a/test/data/manifest-checksums/eln_11-aarch64-azure-empty b/test/data/manifest-checksums/eln_11-aarch64-azure-empty index d011a3512d..826509f335 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-azure-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-azure-empty @@ -1 +1 @@ -bdf9fafddb3766d907478a8b2ea29300b37821158e495a77c1820a63b0b89182 +534d73bb3d813414ce7c9e7a5eae86bc4b7c6629b3548bcbd9ac4e078e097c0e diff --git a/test/data/manifest-checksums/eln_11-x86_64-azure-empty b/test/data/manifest-checksums/eln_11-x86_64-azure-empty index 1e363fa1de..339356f712 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-azure-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-azure-empty @@ -1 +1 @@ -f8fd359f506644a85a70f5763e8bc1f62244b545ad62bee6956240c5f8e669a0 +0fe6733fb4e25530c602a24b4956ecedee37d97c81dbee4df45d6912e4eb528e From d96989b279e0d82f411e4897e55e0132bb1779d9 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 21 Jul 2026 14:23:25 +0200 Subject: [PATCH 4/8] eln: XBOOTLDR GUID for LVM partition tables The LVM partition tables erroneously set the GUID for the XBOOTLDR partition to filesystem data. Instead use the DPS [1] UUID for XBOOTLDR, the same as the non-LVM partition table. [1]: https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ Signed-off-by: Simon de Vlieger --- data/distrodefs/eln-11/disk.yaml | 6 ++---- test/data/manifest-checksums/eln_11-aarch64-azure-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-azure-empty | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index 9a9995645c..bbab4691f9 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -144,16 +144,14 @@ type: "gpt" partitions: - *default_partition_esp - - <<: *default_partition_xbootldr - type: *filesystem_data_guid + - *default_partition_xbootldr - *default_partition_bios - *default_partition_root_xfs_lvm aarch64: &default_partition_tables_xfs_lvm_aarch64 type: "gpt" partitions: - *default_partition_esp - - <<: *default_partition_xbootldr - type: *filesystem_data_guid + - *default_partition_xbootldr - *default_partition_root_xfs_lvm ppc64le: type: "dos" diff --git a/test/data/manifest-checksums/eln_11-aarch64-azure-empty b/test/data/manifest-checksums/eln_11-aarch64-azure-empty index 826509f335..17da794dc2 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-azure-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-azure-empty @@ -1 +1 @@ -534d73bb3d813414ce7c9e7a5eae86bc4b7c6629b3548bcbd9ac4e078e097c0e +022c8d07d197575e76b2523020baf69b886e85ad7b3f7b494d23cdcba4962e72 diff --git a/test/data/manifest-checksums/eln_11-x86_64-azure-empty b/test/data/manifest-checksums/eln_11-x86_64-azure-empty index 339356f712..7a0c1b77ad 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-azure-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-azure-empty @@ -1 +1 @@ -0fe6733fb4e25530c602a24b4956ecedee37d97c81dbee4df45d6912e4eb528e +1bdd74a07de23ff78b58d34499202c5aa10c83f2038deb691ee3289e25439bec From 0cd82cb0c5630f7995fe78db1ef384ab50b30da4 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 21 Jul 2026 14:25:42 +0200 Subject: [PATCH 5/8] eln: move BIOS partition for LVM The BIOS partition for the LVM partition table layout was in the middle of other partitions. In the non-LVM table it's at the front. Let's move it for LVM. Signed-off-by: Simon de Vlieger --- data/distrodefs/eln-11/disk.yaml | 2 +- test/data/manifest-checksums/eln_11-x86_64-azure-empty | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index bbab4691f9..edd349f74c 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -143,9 +143,9 @@ x86_64: &default_partition_tables_xfs_lvm_x86_64 type: "gpt" partitions: + - *default_partition_bios - *default_partition_esp - *default_partition_xbootldr - - *default_partition_bios - *default_partition_root_xfs_lvm aarch64: &default_partition_tables_xfs_lvm_aarch64 type: "gpt" diff --git a/test/data/manifest-checksums/eln_11-x86_64-azure-empty b/test/data/manifest-checksums/eln_11-x86_64-azure-empty index 7a0c1b77ad..eefb59bc4e 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-azure-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-azure-empty @@ -1 +1 @@ -1bdd74a07de23ff78b58d34499202c5aa10c83f2038deb691ee3289e25439bec +be335e0fb0536037201d775b20854830ecf2401920bedaf41bcd7f7a71ae31f5 From 9b4645200dde74c4072f73a1061f3d252fdaa6cc Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 21 Jul 2026 14:30:54 +0200 Subject: [PATCH 6/8] eln: labels for s390x and ppc64le The s390x and ppc64le partition tables set empty labels for their filesystems. Let's share the labels with the rest of the partitions instead. Signed-off-by: Simon de Vlieger --- data/distrodefs/eln-11/disk.yaml | 12 ------------ .../manifest-checksums/eln_11-ppc64le-qcow2-empty | 2 +- .../data/manifest-checksums/eln_11-s390x-qcow2-empty | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index edd349f74c..f0973ee909 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -123,18 +123,12 @@ - *default_partition_prep - <<: *default_partition_root_xfs type: "" - payload: - <<: *default_partition_root_xfs_payload - label: "" s390x: type: "dos" partitions: - <<: *default_partition_root_xfs type: "" bootable: true - payload: - <<: *default_partition_root_xfs_payload - label: "" # The default partition tables for all images that use a XFS on LVM on the root partition. Note # that the layout for s390x and ppc64le diverges and that some default partition sizes, labels, @@ -159,18 +153,12 @@ - *default_partition_prep - <<: *default_partition_root_xfs type: "" - payload: - <<: *default_partition_root_xfs_payload - label: "" s390x: type: "dos" partitions: - <<: *default_partition_root_xfs type: "" bootable: true - payload: - <<: *default_partition_root_xfs_payload - label: "" s390x_zipl_platform: &s390x_zipl_platform arch: "s390x" diff --git a/test/data/manifest-checksums/eln_11-ppc64le-qcow2-empty b/test/data/manifest-checksums/eln_11-ppc64le-qcow2-empty index c9447be20d..8ed3ea28cf 100644 --- a/test/data/manifest-checksums/eln_11-ppc64le-qcow2-empty +++ b/test/data/manifest-checksums/eln_11-ppc64le-qcow2-empty @@ -1 +1 @@ -3297c3bc3a38b0e569e2b63d10e02ff09062dd9fb3ece3ff3e248576d31af54f +1016c4b3db219f3c04c19e77a108a590c0ceb227a50219c5ddd2e2b320f82f55 diff --git a/test/data/manifest-checksums/eln_11-s390x-qcow2-empty b/test/data/manifest-checksums/eln_11-s390x-qcow2-empty index 502cefa879..4f6519dbd0 100644 --- a/test/data/manifest-checksums/eln_11-s390x-qcow2-empty +++ b/test/data/manifest-checksums/eln_11-s390x-qcow2-empty @@ -1 +1 @@ -720f716c4cdd0b2acf5973f3b0cf4e9c284ce72ed065b517a08f459369e35809 +80a09cd3a3139a0db81f2226518dd03fab77ab4c42c3b6990faf5f6b913ef20d From 1d8619e3251fe730bd33f0f86fa412f636257912 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 21 Jul 2026 14:35:59 +0200 Subject: [PATCH 7/8] eln: use DPS UUIDs for non-LVM For the non-LVM partition table use DPS [1] UUIDs for the GPT partition tables for the root partition. This only affects x86_64 and aarch64 as we use DOS partition tables for s390x and ppc64le. Note that for the LVM partition table we use the LVM type UUID for the partition that contains the LVM layout thus nothing changes there. [1]: https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ Signed-off-by: Simon de Vlieger --- data/distrodefs/eln-11/disk.yaml | 10 ++++++---- test/data/manifest-checksums/eln_11-aarch64-ami-empty | 2 +- .../eln_11-aarch64-ami-file_customizations | 2 +- test/data/manifest-checksums/eln_11-aarch64-ec2-empty | 2 +- .../data/manifest-checksums/eln_11-aarch64-qcow2-empty | 2 +- .../eln_11-aarch64-vagrant_libvirt-empty | 2 +- test/data/manifest-checksums/eln_11-aarch64-vhd-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-ami-empty | 2 +- .../eln_11-x86_64-ami-file_customizations | 2 +- test/data/manifest-checksums/eln_11-x86_64-ec2-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-gce-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-oci-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-ova-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-qcow2-empty | 2 +- .../eln_11-x86_64-vagrant_libvirt-empty | 2 +- .../eln_11-x86_64-vagrant_virtualbox-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-vhd-empty | 2 +- test/data/manifest-checksums/eln_11-x86_64-vmdk-empty | 2 +- 18 files changed, 23 insertions(+), 21 deletions(-) diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index f0973ee909..911da1e3fb 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -6,8 +6,9 @@ - &bios_boot_partition_guid "21686148-6449-6E6F-744E-656564454649" - &efi_system_partition_guid "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" - &xbootldr_partition_guid "BC13C2FF-59E6-4262-A352-B275FD6F7172" - - &filesystem_data_guid "0FC63DAF-8483-4772-8E79-3D69D8477DE4" - &lvm_partition_guid "E6D6D379-F507-44C2-A23C-238F2A3DF928" + - &root_partition_guid_x86_64 "4f68bce3-e8cd-4db1-96e7-fbcaf984b709" + - &root_partition_guid_aarch64 "b921b045-1df0-41c3-af44-4c6f280d3fae" # The default partitions used within the partition tables, this allows for slightly # easier composability in the tables. @@ -44,7 +45,6 @@ fstab_passno: 0 - &default_partition_root_xfs size: "2 GiB" - type: *filesystem_data_guid payload_type: "filesystem" payload: &default_partition_root_xfs_payload type: "xfs" @@ -111,12 +111,14 @@ partitions: - *default_partition_bios - *default_partition_esp - - *default_partition_root_xfs + - <<: *default_partition_root_xfs + type: *root_partition_guid_x86_64 aarch64: type: "gpt" partitions: - *default_partition_esp - - *default_partition_root_xfs + - <<: *default_partition_root_xfs + type: *root_partition_guid_aarch64 ppc64le: type: "dos" partitions: diff --git a/test/data/manifest-checksums/eln_11-aarch64-ami-empty b/test/data/manifest-checksums/eln_11-aarch64-ami-empty index 3e68228758..5b0dca43d0 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ami-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-ami-empty @@ -1 +1 @@ -b31b525cfd1ac3f5b06d70c88c3ea75fc29ba9941c673b71fbe6467a4e359529 +474c17ab612f3d8c86c33c8571884443ceac4895c2ccd3e49607b07ad4bf6934 diff --git a/test/data/manifest-checksums/eln_11-aarch64-ami-file_customizations b/test/data/manifest-checksums/eln_11-aarch64-ami-file_customizations index 719cf0146b..d85e433020 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ami-file_customizations +++ b/test/data/manifest-checksums/eln_11-aarch64-ami-file_customizations @@ -1 +1 @@ -d3612c9011a4124b5ba6731695cfb2a8f3fd5fcec0f07b4db80ee67914bd2b16 +4d23be983aa66ef1f54aaeeb931ee711622ba3f729d07091ae864be17d665a70 diff --git a/test/data/manifest-checksums/eln_11-aarch64-ec2-empty b/test/data/manifest-checksums/eln_11-aarch64-ec2-empty index 160e37a706..0a349cf1c5 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ec2-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-ec2-empty @@ -1 +1 @@ -cc6b234d40a86834562e31e7829c9c2d511f130f864d63e1b49f3f1a55ab8667 +0057818445ff0985dfa8d9bae7afe180ccab04f4b85304a153fa629bef859535 diff --git a/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty b/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty index 8290e4346a..f24a6b10b2 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty @@ -1 +1 @@ -a0f3e666f5f07bf798ad5e83d95598e32ea5c9196471df5bb78d63872d487d2e +c167d5024effb3fb3a5a7f621b908dd0b4d4001fd31ed34244ba220d86f3eb9d diff --git a/test/data/manifest-checksums/eln_11-aarch64-vagrant_libvirt-empty b/test/data/manifest-checksums/eln_11-aarch64-vagrant_libvirt-empty index fafa743aef..4d9fb41f30 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-vagrant_libvirt-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-vagrant_libvirt-empty @@ -1 +1 @@ -2defe5de5594320296d09450bfc0d3fa1ed2576b824adceddaf4c48d6054484b +4c554ca5866b560adf5a6520b774db05d6e1fd241e478d1ccba9ec4abf82189c diff --git a/test/data/manifest-checksums/eln_11-aarch64-vhd-empty b/test/data/manifest-checksums/eln_11-aarch64-vhd-empty index 42ec2d9c28..0be58d57c2 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-vhd-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-vhd-empty @@ -1 +1 @@ -d9607069596e50de5b28a4f7d676565c97a54b8cc90958d866c312b4b1fa52c5 +91af37173c5ad38c43b9d2123a78111b5a3b76da4c6a80727ef3af7d33d349e2 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ami-empty b/test/data/manifest-checksums/eln_11-x86_64-ami-empty index 9ecae1b9a7..2d55602bef 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ami-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-ami-empty @@ -1 +1 @@ -ba683d79c244c2e7dfa1df868414abd3b98cf986f1cb0c53a2c534de546550c0 +fbf8baee4246a41ff9ceeeb0266d24c37486e046602da797887f11b6316651a9 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ami-file_customizations b/test/data/manifest-checksums/eln_11-x86_64-ami-file_customizations index 722f59e95f..41ab8c461a 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ami-file_customizations +++ b/test/data/manifest-checksums/eln_11-x86_64-ami-file_customizations @@ -1 +1 @@ -46081cc9216493f3870d80b3327d8c63fd1f4dc9e8f649e3566d15005491af0b +c508f151516485a0135f5fc35fd0293c7fa46e8a7a9504ad7cf177c4f7588d18 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ec2-empty b/test/data/manifest-checksums/eln_11-x86_64-ec2-empty index 14bc8c303c..8a591b34c1 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ec2-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-ec2-empty @@ -1 +1 @@ -3d0316661b376b6c862e5a297db1fa9aded63b4fe3d5dca90339d1940700de06 +cc7ec18bbf4ccf05d5de3f99205955062c4d3a025447ae129f490f859ae7197a diff --git a/test/data/manifest-checksums/eln_11-x86_64-gce-empty b/test/data/manifest-checksums/eln_11-x86_64-gce-empty index cf8bdc06cd..012f5e0898 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-gce-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-gce-empty @@ -1 +1 @@ -cb3dfd97d2dc779467e76957821bd112bc09e53cc6d63e04cc5f027fb3727f83 +dd45ec9c31a5cda333061eb3a24cff3a94efba059766f7e2df461f8e9756925a diff --git a/test/data/manifest-checksums/eln_11-x86_64-oci-empty b/test/data/manifest-checksums/eln_11-x86_64-oci-empty index e6ac36d9ba..efcb7da6c5 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-oci-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-oci-empty @@ -1 +1 @@ -bfcf046c6aed5dd3171ed401719ffc6880be05c14aa76509442440bb98cdaee6 +ac866b913277223b7db49d62ea4b83c453086be03ff1bb15c3879b97b0e32c07 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ova-empty b/test/data/manifest-checksums/eln_11-x86_64-ova-empty index 3fbebb125d..7e344ceddc 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ova-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-ova-empty @@ -1 +1 @@ -ebaebb5c61ba866755e07eded011ba3c4bc8c0574f8c5393907abf00d40691bf +a8acecc07b78813be39ccae81bf4d55f6d8d931dbc9ba35dfcf32f451900d505 diff --git a/test/data/manifest-checksums/eln_11-x86_64-qcow2-empty b/test/data/manifest-checksums/eln_11-x86_64-qcow2-empty index 741b3b896f..eae0925f65 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-qcow2-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-qcow2-empty @@ -1 +1 @@ -22c1950f75f85506e36f8453adfaa43cfdf358d4056633f99cbab85c42327f81 +011246c3e5967c27eb21f373d61ff74e0d748e361415904c6444b73674adf48a diff --git a/test/data/manifest-checksums/eln_11-x86_64-vagrant_libvirt-empty b/test/data/manifest-checksums/eln_11-x86_64-vagrant_libvirt-empty index 12948b4c27..f188419b9b 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-vagrant_libvirt-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-vagrant_libvirt-empty @@ -1 +1 @@ -b37e237e1435cdb60b53fbe26006c0e0f721e0432bda066da0c323159ee7d6c5 +b57269ddaac26fda402a28966f1aa8d19bac60034ae50941d4bb0ed18059bf28 diff --git a/test/data/manifest-checksums/eln_11-x86_64-vagrant_virtualbox-empty b/test/data/manifest-checksums/eln_11-x86_64-vagrant_virtualbox-empty index defd58f523..e2b9b1bdd0 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-vagrant_virtualbox-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-vagrant_virtualbox-empty @@ -1 +1 @@ -139a1b91c0da3523b4cd21dd76cc3329143f5a27cf0dd52886a331cd2e969099 +bde726752e879d0f857a8d7afd6e970011e4678b410b22597893b3117844a051 diff --git a/test/data/manifest-checksums/eln_11-x86_64-vhd-empty b/test/data/manifest-checksums/eln_11-x86_64-vhd-empty index 4d84f41365..6e73be2a11 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-vhd-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-vhd-empty @@ -1 +1 @@ -a274cbee93f8b2b2df906a98006757260b18f3f08c0a4dd193e5bcc2b51392ab +0fbfd50ad3ef62950e2433631f299b9426f94ce76f950c19b6332408fe35bdc3 diff --git a/test/data/manifest-checksums/eln_11-x86_64-vmdk-empty b/test/data/manifest-checksums/eln_11-x86_64-vmdk-empty index 19fd158691..728162fe4c 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-vmdk-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-vmdk-empty @@ -1 +1 @@ -7606b390be13f9f25f1440299ac0420c98106c147f1404cc0ea47f8082231149 +4a13a60774e24e906d694656cb82784272d52dcbacaeb11000fbb39ee5bd8e16 From e2b644bd49167f4e199b8bf2f25fc9da15b2f8b9 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 21 Jul 2026 14:40:59 +0200 Subject: [PATCH 8/8] eln: disk images are LVM by default Move all disk images to use the LVM layout by default, dropping the non-LVM layout definition in the process. This unifies the disk layout that ELN uses across all disk artifacts and aligns it with the wants of the RHEL virt group. Users are able to define other layouts as they desire, RHEL also publishes non-LVM images to various clouds. These are configured in Pungi at the moment but we *might* want to introduce separate image types for LVM vs no-LVM or provide a different selection mechanism to make it easier to have two standard layouts. Signed-off-by: Simon de Vlieger --- data/distrodefs/eln-11/disk.yaml | 45 +++---------------- .../eln_11-aarch64-ami-all_customizations | 2 +- .../eln_11-aarch64-ami-empty | 2 +- .../eln_11-aarch64-ami-file_customizations | 2 +- .../eln_11-aarch64-ec2-empty | 2 +- .../eln_11-aarch64-qcow2-empty | 2 +- .../eln_11-aarch64-vagrant_libvirt-empty | 2 +- .../eln_11-aarch64-vhd-empty | 2 +- .../eln_11-x86_64-ami-all_customizations | 2 +- .../eln_11-x86_64-ami-empty | 2 +- .../eln_11-x86_64-ami-file_customizations | 2 +- .../eln_11-x86_64-ec2-empty | 2 +- .../eln_11-x86_64-gce-empty | 2 +- .../eln_11-x86_64-oci-empty | 2 +- .../eln_11-x86_64-ova-empty | 2 +- .../eln_11-x86_64-qcow2-empty | 2 +- .../eln_11-x86_64-vagrant_libvirt-empty | 2 +- .../eln_11-x86_64-vagrant_virtualbox-empty | 2 +- .../eln_11-x86_64-vhd-empty | 2 +- .../eln_11-x86_64-vmdk-empty | 2 +- 20 files changed, 26 insertions(+), 57 deletions(-) diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index 911da1e3fb..fcc511ace0 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -102,39 +102,8 @@ mountpoint: "/var" fstab_options: "defaults" - # The default partition tables for all images that use a plain XFS root partition. In this - # case there is no separate XBOOTLDR partition. For ppc64le and s390x the respective necessary - # partitions are set. - default_partition_tables_xfs: &default_partition_tables_xfs - x86_64: - type: "gpt" - partitions: - - *default_partition_bios - - *default_partition_esp - - <<: *default_partition_root_xfs - type: *root_partition_guid_x86_64 - aarch64: - type: "gpt" - partitions: - - *default_partition_esp - - <<: *default_partition_root_xfs - type: *root_partition_guid_aarch64 - ppc64le: - type: "dos" - partitions: - - *default_partition_prep - - <<: *default_partition_root_xfs - type: "" - s390x: - type: "dos" - partitions: - - <<: *default_partition_root_xfs - type: "" - bootable: true - - # The default partition tables for all images that use a XFS on LVM on the root partition. Note - # that the layout for s390x and ppc64le diverges and that some default partition sizes, labels, - # and types, diverge more than necessary at the moment. + # The default partition tables for all disk images. It sets up a LVM root with various volumes + # inside it and a separate XBOOTLDR partition. default_partition_tables_xfs_lvm: &default_partition_tables_xfs_lvm x86_64: &default_partition_tables_xfs_lvm_x86_64 type: "gpt" @@ -453,7 +422,7 @@ image_types: enabled: false subscription_manager: enabled: false - partition_table: *default_partition_tables_xfs + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - *common_disk_pkgset_exclude @@ -609,7 +578,7 @@ image_types: apply_network_config: false datasource_list: - "Azure" - partition_table: *default_partition_tables_xfs + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - *common_disk_pkgset_exclude @@ -648,7 +617,7 @@ image_types: image_config: kernel_options: - "ro" - partition_table: *default_partition_tables_xfs + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - include: @@ -775,7 +744,7 @@ image_types: add_drivers: - "nvme" - "xen-blkfront" - partition_table: *default_partition_tables_xfs + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - *common_disk_pkgset_exclude @@ -901,7 +870,7 @@ image_types: config: "InstanceSetup": set_boto_config: false - partition_table: *default_partition_tables_xfs + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - include: diff --git a/test/data/manifest-checksums/eln_11-aarch64-ami-all_customizations b/test/data/manifest-checksums/eln_11-aarch64-ami-all_customizations index 2393bdccd8..7bf779eef5 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/eln_11-aarch64-ami-all_customizations @@ -1 +1 @@ -ceca5ec8fbb17b0f84d51cc3b37a0e85fadf57ab6e5d92b56fd2293a4a3fb93e +c5dbc83cd79e60082d474f2755ce745eba27f2ebac6526773000c81f13ab4270 diff --git a/test/data/manifest-checksums/eln_11-aarch64-ami-empty b/test/data/manifest-checksums/eln_11-aarch64-ami-empty index 5b0dca43d0..c4e9c5164e 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ami-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-ami-empty @@ -1 +1 @@ -474c17ab612f3d8c86c33c8571884443ceac4895c2ccd3e49607b07ad4bf6934 +4b11d0828d40ada9db5d6adacce63e6a0e2dd4301adcaa6391309f82370227a3 diff --git a/test/data/manifest-checksums/eln_11-aarch64-ami-file_customizations b/test/data/manifest-checksums/eln_11-aarch64-ami-file_customizations index d85e433020..e28a9fb314 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ami-file_customizations +++ b/test/data/manifest-checksums/eln_11-aarch64-ami-file_customizations @@ -1 +1 @@ -4d23be983aa66ef1f54aaeeb931ee711622ba3f729d07091ae864be17d665a70 +ee0396fd56873530d065d6114cd2cfb1742f985e1674822ae4a0911564c72f65 diff --git a/test/data/manifest-checksums/eln_11-aarch64-ec2-empty b/test/data/manifest-checksums/eln_11-aarch64-ec2-empty index 0a349cf1c5..73f9740a9d 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ec2-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-ec2-empty @@ -1 +1 @@ -0057818445ff0985dfa8d9bae7afe180ccab04f4b85304a153fa629bef859535 +2900c04f8d97b04af74fddbe6d1ca33de019674ae14c675e3d36712881704879 diff --git a/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty b/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty index f24a6b10b2..3065015396 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty @@ -1 +1 @@ -c167d5024effb3fb3a5a7f621b908dd0b4d4001fd31ed34244ba220d86f3eb9d +bf0c79eecc14dec2d40676fe41735c5bcdd40ba192e5fd2c3473b3672d13bac8 diff --git a/test/data/manifest-checksums/eln_11-aarch64-vagrant_libvirt-empty b/test/data/manifest-checksums/eln_11-aarch64-vagrant_libvirt-empty index 4d9fb41f30..e04405e77a 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-vagrant_libvirt-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-vagrant_libvirt-empty @@ -1 +1 @@ -4c554ca5866b560adf5a6520b774db05d6e1fd241e478d1ccba9ec4abf82189c +9f290f11ee3759dae30033a4107f291cba0bdfd7224ec1785f57d3de3f2136b1 diff --git a/test/data/manifest-checksums/eln_11-aarch64-vhd-empty b/test/data/manifest-checksums/eln_11-aarch64-vhd-empty index 0be58d57c2..db15e34045 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-vhd-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-vhd-empty @@ -1 +1 @@ -91af37173c5ad38c43b9d2123a78111b5a3b76da4c6a80727ef3af7d33d349e2 +64fb26372fde070a416167d69580c702e09469718278cb071f1e583de11f76e9 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ami-all_customizations b/test/data/manifest-checksums/eln_11-x86_64-ami-all_customizations index 31c0926714..4d602f5084 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/eln_11-x86_64-ami-all_customizations @@ -1 +1 @@ -0886409da9fae4e6e30774e1ebd78f6f1963248839ecafac4b9817843090c68a +fae9178d6d17758f047f18614d1c8f7c42fe0113a8746ab5cee03653d1c78583 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ami-empty b/test/data/manifest-checksums/eln_11-x86_64-ami-empty index 2d55602bef..0c906e0366 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ami-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-ami-empty @@ -1 +1 @@ -fbf8baee4246a41ff9ceeeb0266d24c37486e046602da797887f11b6316651a9 +623703c9958e86e4a7fa79c8f6f28c7228c4f1de81dac1ce537555e38e627fd3 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ami-file_customizations b/test/data/manifest-checksums/eln_11-x86_64-ami-file_customizations index 41ab8c461a..4b0a84d30c 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ami-file_customizations +++ b/test/data/manifest-checksums/eln_11-x86_64-ami-file_customizations @@ -1 +1 @@ -c508f151516485a0135f5fc35fd0293c7fa46e8a7a9504ad7cf177c4f7588d18 +666809e3939eb0e066d86cdabf285cab5213c485b07828e6ae45e29a97ad12f9 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ec2-empty b/test/data/manifest-checksums/eln_11-x86_64-ec2-empty index 8a591b34c1..c6fc04b487 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ec2-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-ec2-empty @@ -1 +1 @@ -cc7ec18bbf4ccf05d5de3f99205955062c4d3a025447ae129f490f859ae7197a +37bacd819485460a7aadf4ae10d58327f21cd40edfa4e9bea1450a13ff9e78d0 diff --git a/test/data/manifest-checksums/eln_11-x86_64-gce-empty b/test/data/manifest-checksums/eln_11-x86_64-gce-empty index 012f5e0898..c50846fa6b 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-gce-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-gce-empty @@ -1 +1 @@ -dd45ec9c31a5cda333061eb3a24cff3a94efba059766f7e2df461f8e9756925a +db8d893fd105cf689bd0da017a9f8d6d6b1a5053275d23e245629b5f8c98afef diff --git a/test/data/manifest-checksums/eln_11-x86_64-oci-empty b/test/data/manifest-checksums/eln_11-x86_64-oci-empty index efcb7da6c5..3365610700 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-oci-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-oci-empty @@ -1 +1 @@ -ac866b913277223b7db49d62ea4b83c453086be03ff1bb15c3879b97b0e32c07 +073efab06ee2670380c398b82d3607100e5e59d6515600b0e3d5f83c2e183974 diff --git a/test/data/manifest-checksums/eln_11-x86_64-ova-empty b/test/data/manifest-checksums/eln_11-x86_64-ova-empty index 7e344ceddc..2be26e5812 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-ova-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-ova-empty @@ -1 +1 @@ -a8acecc07b78813be39ccae81bf4d55f6d8d931dbc9ba35dfcf32f451900d505 +36b9312a3ef6e94662526331c7cdfd12005f3c5f997b3ee91a9048fd07cd522b diff --git a/test/data/manifest-checksums/eln_11-x86_64-qcow2-empty b/test/data/manifest-checksums/eln_11-x86_64-qcow2-empty index eae0925f65..2cda4f77d2 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-qcow2-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-qcow2-empty @@ -1 +1 @@ -011246c3e5967c27eb21f373d61ff74e0d748e361415904c6444b73674adf48a +ecde1f825f7301fc9ec999920847ecb3147c551eacd822aed8cc621065872b06 diff --git a/test/data/manifest-checksums/eln_11-x86_64-vagrant_libvirt-empty b/test/data/manifest-checksums/eln_11-x86_64-vagrant_libvirt-empty index f188419b9b..0d15a20af3 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-vagrant_libvirt-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-vagrant_libvirt-empty @@ -1 +1 @@ -b57269ddaac26fda402a28966f1aa8d19bac60034ae50941d4bb0ed18059bf28 +56062429d6b8656fdd28ba7424d4ba556d327e3ac410c4927861fd4f9c642905 diff --git a/test/data/manifest-checksums/eln_11-x86_64-vagrant_virtualbox-empty b/test/data/manifest-checksums/eln_11-x86_64-vagrant_virtualbox-empty index e2b9b1bdd0..923c66e137 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-vagrant_virtualbox-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-vagrant_virtualbox-empty @@ -1 +1 @@ -bde726752e879d0f857a8d7afd6e970011e4678b410b22597893b3117844a051 +0335e9ca6d9d02de57c1a1941ef618a3b941813a72faf8f01e67bb05755fe62a diff --git a/test/data/manifest-checksums/eln_11-x86_64-vhd-empty b/test/data/manifest-checksums/eln_11-x86_64-vhd-empty index 6e73be2a11..30ec202eba 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-vhd-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-vhd-empty @@ -1 +1 @@ -0fbfd50ad3ef62950e2433631f299b9426f94ce76f950c19b6332408fe35bdc3 +8c54f3f54b64ad087c633efb83ee0464e5c8f116cc2143caff542da9f7258cb3 diff --git a/test/data/manifest-checksums/eln_11-x86_64-vmdk-empty b/test/data/manifest-checksums/eln_11-x86_64-vmdk-empty index 728162fe4c..e117de81c1 100644 --- a/test/data/manifest-checksums/eln_11-x86_64-vmdk-empty +++ b/test/data/manifest-checksums/eln_11-x86_64-vmdk-empty @@ -1 +1 @@ -4a13a60774e24e906d694656cb82784272d52dcbacaeb11000fbb39ee5bd8e16 +a1828988fd491ee8066e6b9308f71d6303bfc29a57c13799a53ac79dab4dd52e