distro: drop static UUIDs from bootc partition table

mvo5 · supakeen · commit 500f77c629ba · 2025-10-29T08:34:25.000Z
See osbuild#1922 - this commit does the same for bootc images.
diff --git a/data/distrodefs/bootc-generic/imagetypes.yaml b/data/distrodefs/bootc-generic/imagetypes.yaml
@@ -32,38 +32,22 @@
       - &filesystem_data_guid "0FC63DAF-8483-4772-8E79-3D69D8477DE4"
       - &xboot_ldr_partition_guid "BC13C2FF-59E6-4262-A352-B275FD6F7172"
       - &prep_partition_guid "9E1A2D38-C612-4316-AA26-8B49521E5A8B"
-    # 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"
 
   partition_tables:
     default_bootc_partition_table: &default_bootc_partition_table
       x86_64:
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         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: "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: "EFI-SYSTEM"
               fstab_options: "umask=0077,shortname=winnt"
@@ -72,7 +56,6 @@
           - &default_partition_table_part_boot
             size: "1 GiB"
             type: *filesystem_data_guid
-            uuid: *data_partition_uuid
             payload_type: "filesystem"
             payload:
               mountpoint: "/boot"
@@ -81,21 +64,18 @@
           - &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
               label: "root"
               mountpoint: "/"
               fstab_options: "ro"
       aarch64: &default_partition_table_aarch64
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         partitions:
           - *default_partition_table_part_efi
           - *default_partition_table_part_boot
           - *default_partition_table_part_root
       ppc64le:
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         partitions:
           - size: "4 MiB"
@@ -104,7 +84,6 @@
           - *default_partition_table_part_boot
           - *default_partition_table_part_root
       s390x:
-        uuid: "D209C89E-EA5E-4FBD-B161-B461CCE297E0"
         type: "gpt"
         partitions:
           - *default_partition_table_part_boot
diff --git a/test/data/manifest-checksums/bootc_test_os_1-aarch64-ami-empty b/test/data/manifest-checksums/bootc_test_os_1-aarch64-ami-empty
@@ -1 +1 @@
-be92367cbe05c5dba5c6061ad09d70d8e8357592
+6fedbadf0ad99584e25c3a2f3b8510233eb9b667
diff --git a/test/data/manifest-checksums/bootc_test_os_1-aarch64-gce-empty b/test/data/manifest-checksums/bootc_test_os_1-aarch64-gce-empty
@@ -1 +1 @@
-5a2e44f05d0775d9cc7c988cf4479a211100e93e
+1dabe7d07ac7ddf6f8e4e0a0d1f3ed3ea3d7d010
diff --git a/test/data/manifest-checksums/bootc_test_os_1-aarch64-ova-empty b/test/data/manifest-checksums/bootc_test_os_1-aarch64-ova-empty
@@ -1 +1 @@
-84fe6462a56271c998d3b51c9d74d9514aae21a4
+1d35826776093132275e4eab0f58d529628744e6
diff --git a/test/data/manifest-checksums/bootc_test_os_1-aarch64-qcow2-empty b/test/data/manifest-checksums/bootc_test_os_1-aarch64-qcow2-empty
@@ -1 +1 @@
-439078c68a3c2225d89dd9c925919a13b69bc4f0
+19909019b9bfdecef15e2362968c5ec193604edd
diff --git a/test/data/manifest-checksums/bootc_test_os_1-aarch64-raw-empty b/test/data/manifest-checksums/bootc_test_os_1-aarch64-raw-empty
@@ -1 +1 @@
-d849973f6298f868a5fa965db6912d9a4b1b7da8
+556455a373d6a7567e370769ba82ad5909681dc1
diff --git a/test/data/manifest-checksums/bootc_test_os_1-aarch64-vhd-empty b/test/data/manifest-checksums/bootc_test_os_1-aarch64-vhd-empty
@@ -1 +1 @@
-b05ae8d20f891817ae01e8e930dfe5c694ab9832
+424843c3edf0d3cd69d5bf893171767a1e16a0ab
diff --git a/test/data/manifest-checksums/bootc_test_os_1-aarch64-vmdk-empty b/test/data/manifest-checksums/bootc_test_os_1-aarch64-vmdk-empty
@@ -1 +1 @@
-f2219c91de6431632f2addbe3c9524bd1b299e93
+23129854488486a5507cb7512a7fd057d9122231
diff --git a/test/data/manifest-checksums/bootc_test_os_1-ppc64le-ami-empty b/test/data/manifest-checksums/bootc_test_os_1-ppc64le-ami-empty
@@ -1 +1 @@
-e59e82acecb24375bc56f4bcf7ede6a9f966d357
+fe83f7f85a94adc72783a47a3e9043b517417cd1
diff --git a/test/data/manifest-checksums/bootc_test_os_1-ppc64le-gce-empty b/test/data/manifest-checksums/bootc_test_os_1-ppc64le-gce-empty
@@ -1 +1 @@
-adac2acafceacc285567182b2bb34ee852b0d349
+370c5f735a95fb90b3305f5264e9ce2dbfe0339d
diff --git a/test/data/manifest-checksums/bootc_test_os_1-ppc64le-ova-empty b/test/data/manifest-checksums/bootc_test_os_1-ppc64le-ova-empty
@@ -1 +1 @@
-94cbbc242f012edcc26e135843ab9c8dc5e5553b
+fb5ef343a50900503e60b5338466ad5c79dca2e0
diff --git a/test/data/manifest-checksums/bootc_test_os_1-ppc64le-qcow2-empty b/test/data/manifest-checksums/bootc_test_os_1-ppc64le-qcow2-empty
@@ -1 +1 @@
-8094e94ce116d8dc76554058e220c51c2b994ee8
+19ad9ca41823a44986c212dd0aa72dbdaef82767
diff --git a/test/data/manifest-checksums/bootc_test_os_1-ppc64le-raw-empty b/test/data/manifest-checksums/bootc_test_os_1-ppc64le-raw-empty
@@ -1 +1 @@
-0bbeb4ef032a713f89e0f8d5eae0ecf6b4e103e2
+5ec3c7623ce59352bbb9b986b5638a023d498e7d
diff --git a/test/data/manifest-checksums/bootc_test_os_1-ppc64le-vhd-empty b/test/data/manifest-checksums/bootc_test_os_1-ppc64le-vhd-empty
@@ -1 +1 @@
-83ddce6c176a16644a1686d5907462e9d739b56e
+cb60356056e08cbca49ea0b3899acca9b00fe696
diff --git a/test/data/manifest-checksums/bootc_test_os_1-ppc64le-vmdk-empty b/test/data/manifest-checksums/bootc_test_os_1-ppc64le-vmdk-empty
@@ -1 +1 @@
-22b19f974d84d60296eb9092770b887c89f0ca44
+1404d779f5f88b1b4b965a7d1918e54915e14aae
diff --git a/test/data/manifest-checksums/bootc_test_os_1-s390x-ami-empty b/test/data/manifest-checksums/bootc_test_os_1-s390x-ami-empty
@@ -1 +1 @@
-1f70e6bcf60915aefc48c2483dfe74332519c8da
+bd583001066b2d4801f24ea03321e95ec9a04cec
diff --git a/test/data/manifest-checksums/bootc_test_os_1-s390x-gce-empty b/test/data/manifest-checksums/bootc_test_os_1-s390x-gce-empty
@@ -1 +1 @@
-afac907d5169b9d081f6b40c67ebbecd40a50732
+535ddd2c0203292f008e90740f06e94e2b7806bd
diff --git a/test/data/manifest-checksums/bootc_test_os_1-s390x-ova-empty b/test/data/manifest-checksums/bootc_test_os_1-s390x-ova-empty
@@ -1 +1 @@
-b1c8df167d7ccc1fdf1c0421621e3f1a13f5c60f
+7047760b2ae6e467d82bc7d87e619b3975a42e33
diff --git a/test/data/manifest-checksums/bootc_test_os_1-s390x-qcow2-empty b/test/data/manifest-checksums/bootc_test_os_1-s390x-qcow2-empty
@@ -1 +1 @@
-9934911972c90d344f1115d43cae1a0766f72bdc
+8763d786730e3afb553289e3234b7c1f4c8e34ad
diff --git a/test/data/manifest-checksums/bootc_test_os_1-s390x-raw-empty b/test/data/manifest-checksums/bootc_test_os_1-s390x-raw-empty
@@ -1 +1 @@
-32e1db1f27426b828ea41dee6f070ac90f8e7981
+2ab9cc843a16f3acc0602a070edcc37c28166263
diff --git a/test/data/manifest-checksums/bootc_test_os_1-s390x-vhd-empty b/test/data/manifest-checksums/bootc_test_os_1-s390x-vhd-empty
@@ -1 +1 @@
-8a35a0035c632e2b7c88d7b48c0a793b6f8a9118
+3fd256b851a5a47b64b49221b95373bcc6068983
diff --git a/test/data/manifest-checksums/bootc_test_os_1-s390x-vmdk-empty b/test/data/manifest-checksums/bootc_test_os_1-s390x-vmdk-empty
@@ -1 +1 @@
-9d00abbb11187099bfba2853b6f0a8557d103b59
+d1b81b1b81e04bd231f9b8ea6c0411983215795c
diff --git a/test/data/manifest-checksums/bootc_test_os_1-x86_64-ami-empty b/test/data/manifest-checksums/bootc_test_os_1-x86_64-ami-empty
@@ -1 +1 @@
-201804dda1d4fc678abf4df10e782fcd22dfdad3
+d226a2610270803fbbd1bed30b40b2c3c6da412b
diff --git a/test/data/manifest-checksums/bootc_test_os_1-x86_64-gce-empty b/test/data/manifest-checksums/bootc_test_os_1-x86_64-gce-empty
@@ -1 +1 @@
-139423bc4831ed68f726e579e04bb1913a90f57a
+411fd05605539b5363542c12b0e30bf972643481
diff --git a/test/data/manifest-checksums/bootc_test_os_1-x86_64-ova-empty b/test/data/manifest-checksums/bootc_test_os_1-x86_64-ova-empty
@@ -1 +1 @@
-7018c3b6f62d2cd693ab0dd59ecfaa74e0d41012
+aa196e6defcc3a2c46ebd6c41c725ea10e08364d
diff --git a/test/data/manifest-checksums/bootc_test_os_1-x86_64-qcow2-empty b/test/data/manifest-checksums/bootc_test_os_1-x86_64-qcow2-empty
@@ -1 +1 @@
-f90228bb378ba066b45add09fc33eaf52d3efd56
+f0ef2ae715b47ee8fbabda5cdb9e451f71e1aa34
diff --git a/test/data/manifest-checksums/bootc_test_os_1-x86_64-raw-empty b/test/data/manifest-checksums/bootc_test_os_1-x86_64-raw-empty
@@ -1 +1 @@
-eedbdd59e9ccbecad2f4be6041600d0241f6692a
+92c595ecb9d27b66530178cdd5e015503099ae12
diff --git a/test/data/manifest-checksums/bootc_test_os_1-x86_64-vhd-empty b/test/data/manifest-checksums/bootc_test_os_1-x86_64-vhd-empty
@@ -1 +1 @@
-3332836bfe8103d0b210f53f3d7a918ecea315bc
+73f3c2804d99a3947e6285a8b68ba187ce14675f
diff --git a/test/data/manifest-checksums/bootc_test_os_1-x86_64-vmdk-empty b/test/data/manifest-checksums/bootc_test_os_1-x86_64-vmdk-empty
@@ -1 +1 @@
-b7384e47fdec3ed6ba747dfe1d3a910b2c1426d1
+44f070a343b7fe9b1db8b57afbdaad6bd5ed3321
diff --git a/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-ami-empty b/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-ami-empty
@@ -1 +1 @@
-eb148ebc11dcde5b81b42dbc4d6fe9e3c24a221e
+60a44d4dcf604e57fb3f11d6f0610010354e6ffb
diff --git a/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-gce-empty b/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-gce-empty
@@ -1 +1 @@
-da256b6bbf359f058e6321a77843c4f70c88ecec
+72abd8e9aa663874c4de41154a0872a27580ef14
diff --git a/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-ova-empty b/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-ova-empty
@@ -1 +1 @@
-d023453511e433e6b5dab3029879e3fa98fca531
+23d850967366f636181876da271110bd65ece2a0
diff --git a/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-qcow2-empty b/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-qcow2-empty
@@ -1 +1 @@
-26c1410ce877a24f4e0023aafdf312f5e1c7a90e
+8f7b13b602ef7e7d2cb8485b144a9f531c96508c
diff --git a/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-raw-empty b/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-raw-empty
@@ -1 +1 @@
-3a59566c39c6baaa9bfe5939aab8b0d4f1a414e1
+3577b02e4d1e0f003adebc0c587fc6e35c5a2c53
diff --git a/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-vhd-empty b/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-vhd-empty
@@ -1 +1 @@
-89d01a259aac5a45c30f4b94746c3d73756185a9
+86dc5572c6fd8894d0ee9d97f070c287e436b861
diff --git a/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-vmdk-empty b/test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-vmdk-empty
@@ -1 +1 @@
-4cc099d9acd917bf03541b2fdfa3b0ba9fac87ab
+a67d95f2e94eced982b1e85d6c5678e10b8de837

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-be92367cbe05c5dba5c6061ad09d70d8e8357592`
	`1`	`+6fedbadf0ad99584e25c3a2f3b8510233eb9b667`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5a2e44f05d0775d9cc7c988cf4479a211100e93e`
	`1`	`+1dabe7d07ac7ddf6f8e4e0a0d1f3ed3ea3d7d010`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-84fe6462a56271c998d3b51c9d74d9514aae21a4`
	`1`	`+1d35826776093132275e4eab0f58d529628744e6`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-439078c68a3c2225d89dd9c925919a13b69bc4f0`
	`1`	`+19909019b9bfdecef15e2362968c5ec193604edd`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-d849973f6298f868a5fa965db6912d9a4b1b7da8`
	`1`	`+556455a373d6a7567e370769ba82ad5909681dc1`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b05ae8d20f891817ae01e8e930dfe5c694ab9832`
	`1`	`+424843c3edf0d3cd69d5bf893171767a1e16a0ab`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f2219c91de6431632f2addbe3c9524bd1b299e93`
	`1`	`+23129854488486a5507cb7512a7fd057d9122231`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-e59e82acecb24375bc56f4bcf7ede6a9f966d357`
	`1`	`+fe83f7f85a94adc72783a47a3e9043b517417cd1`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-adac2acafceacc285567182b2bb34ee852b0d349`
	`1`	`+370c5f735a95fb90b3305f5264e9ce2dbfe0339d`