Skip to content

Commit a8f0ac0

Browse files
Johan-Liebert1Johan-Liebert1
committed
osbuild: Use DPS UUID
Use the Discoverable Partition Specification UUID for root and boot partitions We were already using DPS UUID for both partitions, but they were UUIDs for generic Linux Data Parition This lets us use `systemd-systemd-gpt-auto-generator` which is a good choice for LUKS decryption without UKI addons for composefs backend Use architecture specific DPS UUID for root partition, and use XBOOTLDR UUID for boot partition Related: coreos/fedora-coreos-tracker#2060 Closes: coreos/fedora-coreos-tracker#1038 Signed-off-by: Pragyan Poudyal <[email protected]>
1 parent d4327a4 commit a8f0ac0

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ mpp-define-images:
6666
size:
6767
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}"
6868
- name: boot
69-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
69+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
7070
size:
7171
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
7272
- name: root
73-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
73+
type: B921B045-1DF0-41C3-AF44-4C6F280D3FAE
7474
- id: image4k
7575
sector_size:
7676
mpp-format-int: "{four_k_sector_size}"
@@ -89,11 +89,11 @@ mpp-define-images:
8989
size:
9090
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}"
9191
- name: boot
92-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
92+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
9393
size:
9494
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
9595
- name: root
96-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
96+
type: B921B045-1DF0-41C3-AF44-4C6F280D3FAE
9797
pipelines:
9898
# If installing from container then let's pull the container file into a pipeline
9999
- name: oci-archive

‎src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ mpp-define-images:
6767
size:
6868
mpp-format-int: "{reserved_part_size_mb * 1024 * 1024 / sector_size}"
6969
- name: boot
70-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
70+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
7171
size:
7272
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
7373
- name: root
74-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
74+
type: C31C45E6-3F39-412E-80FB-4809C4980599
7575
- id: image4k
7676
sector_size:
7777
mpp-format-int: "{four_k_sector_size}"
@@ -91,11 +91,11 @@ mpp-define-images:
9191
size:
9292
mpp-format-int: "{reserved_part_size_mb * 1024 * 1024 / four_k_sector_size}"
9393
- name: boot
94-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
94+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
9595
size:
9696
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
9797
- name: root
98-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
98+
type: C31C45E6-3F39-412E-80FB-4809C4980599
9999
pipelines:
100100
# If installing from container then let's pull the container file into a pipeline
101101
- name: oci-archive

‎src/osbuild-manifests/coreos.osbuild.riscv64.mpp.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ mpp-define-images:
6666
size:
6767
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}"
6868
- name: boot
69-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
69+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
7070
size:
7171
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
7272
- name: root
73-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
73+
type: 72EC70A6-CF74-40E6-BD49-4BDA08E8F224
7474
- id: image4k
7575
sector_size:
7676
mpp-format-int: "{four_k_sector_size}"
@@ -89,11 +89,11 @@ mpp-define-images:
8989
size:
9090
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}"
9191
- name: boot
92-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
92+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
9393
size:
9494
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
9595
- name: root
96-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
96+
type: 72EC70A6-CF74-40E6-BD49-4BDA08E8F224
9797
pipelines:
9898
# If installing from container then let's pull the container file into a pipeline
9999
- name: oci-archive

‎src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ mpp-define-images:
6262
label: gpt
6363
partitions:
6464
- name: boot
65-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
65+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
6666
size:
6767
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
6868
partnum: 3
6969
- name: root
70-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
70+
type: 5EEAD9A9-FE09-4A1E-A1D7-520D00531306
7171
partnum: 4
7272
- id: image4k
7373
sector_size:
@@ -79,12 +79,12 @@ mpp-define-images:
7979
label: gpt
8080
partitions:
8181
- name: boot
82-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
82+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
8383
size:
8484
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
8585
partnum: 3
8686
- name: root
87-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
87+
type: 5EEAD9A9-FE09-4A1E-A1D7-520D00531306
8888
partnum: 4
8989
pipelines:
9090
# If installing from container then let's pull the container file into a pipeline

‎src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ mpp-define-images:
6767
size:
6868
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}"
6969
- name: boot
70-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
70+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
7171
size:
7272
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
7373
- name: root
74-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
74+
type: 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709
7575
- id: image4k
7676
sector_size:
7777
mpp-format-int: "{four_k_sector_size}"
@@ -91,11 +91,11 @@ mpp-define-images:
9191
size:
9292
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}"
9393
- name: boot
94-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
94+
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
9595
size:
9696
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
9797
- name: root
98-
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
98+
type: 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709
9999
pipelines:
100100
# If installing from container then let's pull the container file into a pipeline
101101
- name: oci-archive

0 commit comments

Comments
 (0)