diff --git a/data/distrodefs/eln-11/disk.yaml b/data/distrodefs/eln-11/disk.yaml index 391e5c6101..fcc511ace0 100644 --- a/data/distrodefs/eln-11/disk.yaml +++ b/data/distrodefs/eln-11/disk.yaml @@ -5,59 +5,130 @@ guids: - &bios_boot_partition_guid "21686148-6449-6E6F-744E-656564454649" - &efi_system_partition_guid "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" - - &filesystem_data_guid "0FC63DAF-8483-4772-8E79-3D69D8477DE4" + - &xbootldr_partition_guid "BC13C2FF-59E6-4262-A352-B275FD6F7172" - &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" - default_partition_tables: &default_partition_tables - x86_64: + # 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" + 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 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" partitions: - - size: "1 MiB" - 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" - 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: + - *default_partition_bios + - *default_partition_esp + - *default_partition_xbootldr + - *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 + - *default_partition_xbootldr + - *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" - payload: - <<: *default_partition_table_part_root_payload - label: "" + - *default_partition_prep + - <<: *default_partition_root_xfs + type: "" s390x: type: "dos" partitions: - - <<: *default_partition_table_part_root_ppc64le + - <<: *default_partition_root_xfs + type: "" bootable: true s390x_zipl_platform: &s390x_zipl_platform @@ -351,8 +422,7 @@ image_types: enabled: false subscription_manager: enabled: false - partition_table: - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - *common_disk_pkgset_exclude @@ -508,8 +578,7 @@ image_types: apply_network_config: false datasource_list: - "Azure" - partition_table: - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - *common_disk_pkgset_exclude @@ -522,90 +591,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 +617,7 @@ image_types: image_config: kernel_options: - "ro" - partition_table: - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - include: @@ -752,8 +744,7 @@ image_types: add_drivers: - "nvme" - "xen-blkfront" - partition_table: - <<: *default_partition_tables + partition_table: *default_partition_tables_xfs_lvm package_sets: os: - *common_disk_pkgset_exclude @@ -879,10 +870,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_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 3e68228758..c4e9c5164e 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ami-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-ami-empty @@ -1 +1 @@ -b31b525cfd1ac3f5b06d70c88c3ea75fc29ba9941c673b71fbe6467a4e359529 +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 719cf0146b..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 @@ -d3612c9011a4124b5ba6731695cfb2a8f3fd5fcec0f07b4db80ee67914bd2b16 +ee0396fd56873530d065d6114cd2cfb1742f985e1674822ae4a0911564c72f65 diff --git a/test/data/manifest-checksums/eln_11-aarch64-azure-empty b/test/data/manifest-checksums/eln_11-aarch64-azure-empty index b928eb8602..17da794dc2 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-azure-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-azure-empty @@ -1 +1 @@ -bb30870b136fb528c07f126aa713fdc49ff8bfbef35c2c8fceb5daa553394bc0 +022c8d07d197575e76b2523020baf69b886e85ad7b3f7b494d23cdcba4962e72 diff --git a/test/data/manifest-checksums/eln_11-aarch64-ec2-empty b/test/data/manifest-checksums/eln_11-aarch64-ec2-empty index 160e37a706..73f9740a9d 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-ec2-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-ec2-empty @@ -1 +1 @@ -cc6b234d40a86834562e31e7829c9c2d511f130f864d63e1b49f3f1a55ab8667 +2900c04f8d97b04af74fddbe6d1ca33de019674ae14c675e3d36712881704879 diff --git a/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty b/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty index 8290e4346a..3065015396 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-qcow2-empty @@ -1 +1 @@ -a0f3e666f5f07bf798ad5e83d95598e32ea5c9196471df5bb78d63872d487d2e +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 fafa743aef..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 @@ -2defe5de5594320296d09450bfc0d3fa1ed2576b824adceddaf4c48d6054484b +9f290f11ee3759dae30033a4107f291cba0bdfd7224ec1785f57d3de3f2136b1 diff --git a/test/data/manifest-checksums/eln_11-aarch64-vhd-empty b/test/data/manifest-checksums/eln_11-aarch64-vhd-empty index 42ec2d9c28..db15e34045 100644 --- a/test/data/manifest-checksums/eln_11-aarch64-vhd-empty +++ b/test/data/manifest-checksums/eln_11-aarch64-vhd-empty @@ -1 +1 @@ -d9607069596e50de5b28a4f7d676565c97a54b8cc90958d866c312b4b1fa52c5 +64fb26372fde070a416167d69580c702e09469718278cb071f1e583de11f76e9 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 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 9ecae1b9a7..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 @@ -ba683d79c244c2e7dfa1df868414abd3b98cf986f1cb0c53a2c534de546550c0 +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 722f59e95f..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 @@ -46081cc9216493f3870d80b3327d8c63fd1f4dc9e8f649e3566d15005491af0b +666809e3939eb0e066d86cdabf285cab5213c485b07828e6ae45e29a97ad12f9 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..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 @@ -3768402c30796c36b493f07f5d97207251bfb15cb8ada628479ce592bda29fea +be335e0fb0536037201d775b20854830ecf2401920bedaf41bcd7f7a71ae31f5 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..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 @@ -3d0316661b376b6c862e5a297db1fa9aded63b4fe3d5dca90339d1940700de06 +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 cf8bdc06cd..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 @@ -cb3dfd97d2dc779467e76957821bd112bc09e53cc6d63e04cc5f027fb3727f83 +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 e6ac36d9ba..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 @@ -bfcf046c6aed5dd3171ed401719ffc6880be05c14aa76509442440bb98cdaee6 +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 3fbebb125d..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 @@ -ebaebb5c61ba866755e07eded011ba3c4bc8c0574f8c5393907abf00d40691bf +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 741b3b896f..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 @@ -22c1950f75f85506e36f8453adfaa43cfdf358d4056633f99cbab85c42327f81 +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 12948b4c27..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 @@ -b37e237e1435cdb60b53fbe26006c0e0f721e0432bda066da0c323159ee7d6c5 +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 defd58f523..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 @@ -139a1b91c0da3523b4cd21dd76cc3329143f5a27cf0dd52886a331cd2e969099 +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 4d84f41365..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 @@ -a274cbee93f8b2b2df906a98006757260b18f3f08c0a4dd193e5bcc2b51392ab +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 19fd158691..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 @@ -7606b390be13f9f25f1440299ac0420c98106c147f1404cc0ea47f8082231149 +a1828988fd491ee8066e6b9308f71d6303bfc29a57c13799a53ac79dab4dd52e