disk: drop static UUIDs in defs

data/distrodefs/fedora/imagetypes.yaml

@@ -493,34 +493,19 @@
       - &efi_system_partition_guid "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
       - &filesystem_data_guid "0FC63DAF-8483-4772-8E79-3D69D8477DE4"
       - &xboot_ldr_partition_guid "BC13C2FF-59E6-4262-A352-B275FD6F7172"
-    # static UUIDs for partitions and filesystems
-    # NOTE(akoutsou): These are unnecessary and have stuck around since the
-    # beginning where (I believe) the goal was to have predictable,
-    # reproducible partition tables. They might be removed soon in favour of
-    # proper, random UUIDs, with reproducibility being controlled by fixing
-    # rng seeds.
-    uuids:
-      - &bios_boot_partition_uuid "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-      - &root_partition_uuid "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
-      - &data_partition_uuid "CB07C243-BC44-4717-853E-28852021225B"
-      - &efi_system_partition_uuid "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-      - &efi_filesystem_uuid "7B77-95E7"
 
     # the invidual partitions for easier composibility
     partitions:
       - &default_partition_table_part_bios
         size: "1 MiB"
         bootable: true
         type: *bios_boot_partition_guid
-        uuid: *bios_boot_partition_uuid
       - &default_partition_table_part_efi
         size: "200 MiB"
         type: *efi_system_partition_guid
-        uuid: *efi_system_partition_uuid
         payload_type: "filesystem"
         payload:
           type: vfat
-          uuid: *efi_filesystem_uuid
           mountpoint: "/boot/efi"
           label: "ESP"
           fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
@@ -529,7 +514,6 @@
       - &default_partition_table_part_boot
         size: "2 GiB"
         type: *filesystem_data_guid
-        uuid: *data_partition_uuid
         payload_type: "filesystem"
         payload:
           type: "ext4"
@@ -541,7 +525,6 @@
       - &default_partition_table_part_root
         size: "2 GiB"
         type: *filesystem_data_guid
-        uuid: *root_partition_uuid
         payload_type: "filesystem"
         payload: &default_partition_table_part_root_payload
           type: "ext4"
@@ -554,11 +537,9 @@
       - &iot_base_partition_table_part_efi
         size: "501 MiB"
         type: *efi_system_partition_guid
-        uuid: *efi_system_partition_uuid
         payload_type: "filesystem"
         payload:
           type: vfat
-          uuid: *efi_filesystem_uuid
           mountpoint: "/boot/efi"
           label: "ESP"
           fstab_options: "umask=0077,shortname=winnt"
@@ -567,7 +548,6 @@
       - &iot_base_partition_table_part_boot
         size: "2 GiB"
         type: *filesystem_data_guid
-        uuid: *data_partition_uuid
         payload_type: "filesystem"
         payload:
           type: "ext4"
@@ -579,7 +559,6 @@
       - &iot_base_partition_table_part_root
         size: "2569 MiB"
         type: *filesystem_data_guid
-        uuid: *root_partition_uuid
         payload_type: "filesystem"
         payload: &iot_base_partition_table_part_root_payload
           type: "ext4"
@@ -720,7 +699,6 @@
           - *iot_base_partition_table_part_efi
           - size: "2 GiB"
             type: *xboot_ldr_partition_guid
-            uuid: *data_partition_uuid
             payload_type: "filesystem"
             payload:
               type: "ext4"
@@ -730,7 +708,6 @@
               fstab_freq: 1
               fstab_passno: 1
           - type: *filesystem_data_guid
-            uuid: *root_partition_uuid
             payload_type: "luks"
             payload:
               label: "crypt_root"

data/distrodefs/rhel-10/imagetypes.yaml

@@ -398,36 +398,20 @@
       - &xboot_ldr_partition_guid "BC13C2FF-59E6-4262-A352-B275FD6F7172"
       - &lvm_partition_guid "E6D6D379-F507-44C2-A23C-238F2A3DF928"
       - &root_partition_x86_64_guid "4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709"
-    # static UUIDs for partitions and filesystems
-    # NOTE(akoutsou): These are unnecessary and have stuck around since the
-    # beginning where (I believe) the goal was to have predictable,
-    # reproducible partition tables. They might be removed soon in favour of
-    # proper, random UUIDs, with reproducibility being controlled by fixing
-    # rng seeds.
-    uuids:
-      - &bios_boot_partition_uuid "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-      - &root_partition_uuid "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
-      - &data_partition_uuid "CB07C243-BC44-4717-853E-28852021225B"
-      - &efi_system_partition_uuid "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-      - &efi_filesystem_uuid "7B77-95E7"
 
     default_partition_tables: &default_partition_tables
       x86_64:
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         partitions:
           - size: "1 MiB"
             bootable: true
             type: *bios_boot_partition_guid
-            uuid: *bios_boot_partition_uuid
           - &default_partition_table_part_efi
             size: "200 MiB"
             type: *efi_system_partition_guid
-            uuid: *efi_system_partition_uuid
             payload_type: "filesystem"
             payload:
               type: vfat
-              uuid: *efi_filesystem_uuid
               mountpoint: "/boot/efi"
               label: "ESP"
               fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
@@ -436,7 +420,6 @@
           - &default_partition_table_part_root
             size: "2 GiB"
             type: *filesystem_data_guid
-            uuid: *root_partition_uuid
             payload_type: "filesystem"
             payload: &default_partition_table_part_root_payload
               type: "xfs"
@@ -446,13 +429,11 @@
               fstab_freq: 0
               fstab_passno: 0
       aarch64: &default_partition_table_aarch64
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         partitions:
           - *default_partition_table_part_efi
           - *default_partition_table_part_root
       ppc64le:
-        uuid: "0x14fc63d2"
         type: "dos"
         partitions:
           - size: "4 MiB"
@@ -465,7 +446,6 @@
               <<: *default_partition_table_part_root_payload
               label: ""
       s390x:
-        uuid: "0x14fc63d2"
         type: "dos"
         partitions:
           - <<: *default_partition_table_part_root_ppc64le
@@ -1126,18 +1106,15 @@ image_types:
     filename: "disk.vhd.xz"
     partition_table:
       x86_64:
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         size: "64 GiB"
         partitions:
           - &azure_rhui_part_boot_efi
             size: "500 MiB"
             type: *efi_system_partition_guid
-            UUID: *efi_system_partition_uuid
             payload_type: "filesystem"
             payload:
               type: "vfat"
-              uuid: *efi_filesystem_uuid
               mountpoint: "/boot/efi"
               fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
               fstab_freq: 0
@@ -1146,7 +1123,6 @@ image_types:
           - &azure_rhui_part_boot
             size: "1 GiB"
             type: *filesystem_data_guid
-            uuid: *data_partition_uuid
             payload_type: "filesystem"
             payload:
               type: "xfs"
@@ -1157,10 +1133,8 @@ image_types:
           - size: "2 MiB"
             bootable: true
             type: *bios_boot_partition_guid
-            uuid: *bios_boot_partition_uuid
           - &azure_rhui_part_lvm
             type: *lvm_partition_guid
-            uuid: *root_partition_uuid
             payload_type: "lvm"
             payload:
               name: "rootvg"
@@ -1207,7 +1181,6 @@ image_types:
                     mountpoint: "/var"
                     fstab_options: "defaults"
       aarch64:
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         size: "64 GiB"
         partitions:
@@ -2080,16 +2053,13 @@ image_types:
             - "uki-direct"
     partition_table:
       x86_64:
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         partitions:
           - size: "512 MiB"
             type: *efi_system_partition_guid
-            uuid: *efi_system_partition_uuid
             payload_type: "filesystem"
             payload:
               type: vfat
-              uuid: *efi_filesystem_uuid
               mountpoint: "/boot/efi"
               label: "ESP"
               fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"

data/distrodefs/rhel-7/imagetypes.yaml

@@ -57,18 +57,6 @@
       - &filesystem_data_guid "0FC63DAF-8483-4772-8E79-3D69D8477DE4"
       - &xboot_ldr_partition_guid "BC13C2FF-59E6-4262-A352-B275FD6F7172"
       - &lvm_partition_guid "E6D6D379-F507-44C2-A23C-238F2A3DF928"
-    # static UUIDs for partitions and filesystems
-    # NOTE(akoutsou): These are unnecessary and have stuck around since the
-    # beginning where (I believe) the goal was to have predictable,
-    # reproducible partition tables. They might be removed soon in favour of
-    # proper, random UUIDs, with reproducibility being controlled by fixing
-    # rng seeds.
-    uuids:
-      - &bios_boot_partition_uuid "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
-      - &root_partition_uuid "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
-      - &data_partition_uuid "CB07C243-BC44-4717-853E-28852021225B"
-      - &efi_system_partition_uuid "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
-      - &efi_filesystem_uuid "7B77-95E7"
 
     default_partition_tables: &default_partition_tables
       x86_64:
@@ -79,15 +67,12 @@
             size: "1 MiB"
             bootable: true
             type: *bios_boot_partition_guid
-            uuid: *bios_boot_partition_uuid
           - &default_partition_table_part_efi
             size: "200 MiB"
             type: *efi_system_partition_guid
-            uuid: *efi_system_partition_uuid
             payload_type: "filesystem"
             payload:
               type: vfat
-              uuid: *efi_filesystem_uuid
               mountpoint: "/boot/efi"
               label: "ESP"
               fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
@@ -96,7 +81,6 @@
           - &default_partition_table_part_boot
             size: "500 MiB"
             type: *filesystem_data_guid
-            uuid: *data_partition_uuid
             payload_type: "filesystem"
             payload:
               type: "xfs"
@@ -108,7 +92,6 @@
           - &default_partition_table_part_root
             size: "2 GiB"
             type: *filesystem_data_guid
-            uuid: *root_partition_uuid
             payload_type: "filesystem"
             payload: &default_partition_table_part_root_payload
               type: "xfs"
@@ -126,7 +109,6 @@
           - *bios_boot_partition
           - size: 6_442_450_944  # 6144 * datasizes.MebiByte
             type: *filesystem_data_guid
-            uuid: *root_partition_uuid
             payload_type: "filesystem"
             payload:
               <<: *default_partition_table_part_root_payload
@@ -139,19 +121,16 @@
           - &azure_rhui_part_boot_efi
             size: 524_288_000   # 500 * datasizes.MebiByte
             type: *efi_system_partition_guid
-            UUID: *efi_system_partition_uuid
             payload_type: "filesystem"
             payload:
               type: "vfat"
-              uuid: *efi_filesystem_uuid
               mountpoint: "/boot/efi"
               fstab_options: "defaults,uid=0,gid=0,umask=077,shortname=winnt"
               fstab_freq: 0
               fstab_passno: 2
           - &azure_rhui_part_boot
             size: "500 MiB"
             type: *filesystem_data_guid
-            uuid: *data_partition_uuid
             payload_type: "filesystem"
             payload:
               type: "xfs"
@@ -162,10 +141,8 @@
           - size: "2 MiB"
             bootable: true
             type: *bios_boot_partition_guid
-            uuid: *bios_boot_partition_uuid
           - &azure_rhui_part_lvm
             type: *lvm_partition_guid
-            uuid: *root_partition_uuid
             payload_type: "lvm"
             payload:
               name: "rootvg"