Skip to content

Use DPS UUIDs for root and boot partitions #4380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use DPS UUIDs for root and boot partitions #4380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ mpp-define-images:
size:
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}"
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: B921B045-1DF0-41C3-AF44-4C6F280D3FAE
Comment on lines 68 to +73
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To improve readability and maintainability, consider defining these partition type UUIDs as variables in mpp-vars and referencing them here. This avoids using magic strings and makes their purpose clear. For example, you could add dps_boot_partition_type and dps_root_partition_type_aarch64 to mpp-vars.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_aarch64}'

- id: image4k
sector_size:
mpp-format-int: "{four_k_sector_size}"
Expand All @@ -89,11 +89,11 @@ mpp-define-images:
size:
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: B921B045-1DF0-41C3-AF44-4C6F280D3FAE
Comment on lines 91 to +96
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency, please apply the same variable-based approach for partition type UUIDs in the image4k definition.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_aarch64}'

pipelines:
# If installing from container then let's pull the container file into a pipeline
- name: oci-archive
Expand Down
8 changes: 4 additions & 4 deletions src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ mpp-define-images:
size:
mpp-format-int: "{reserved_part_size_mb * 1024 * 1024 / sector_size}"
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: C31C45E6-3F39-412E-80FB-4809C4980599
Comment on lines 69 to +74
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To improve readability and maintainability, consider defining these partition type UUIDs as variables in mpp-vars and referencing them here. This avoids using magic strings and makes their purpose clear. For example, you could add dps_boot_partition_type and dps_root_partition_type_ppc64le to mpp-vars.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_ppc64le}'

- id: image4k
sector_size:
mpp-format-int: "{four_k_sector_size}"
Expand All @@ -91,11 +91,11 @@ mpp-define-images:
size:
mpp-format-int: "{reserved_part_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: C31C45E6-3F39-412E-80FB-4809C4980599
Comment on lines 93 to +98
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency, please apply the same variable-based approach for partition type UUIDs in the image4k definition.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_ppc64le}'

pipelines:
# If installing from container then let's pull the container file into a pipeline
- name: oci-archive
Expand Down
8 changes: 4 additions & 4 deletions src/osbuild-manifests/coreos.osbuild.riscv64.mpp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ mpp-define-images:
size:
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}"
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: 72EC70A6-CF74-40E6-BD49-4BDA08E8F224
Comment on lines 68 to +73
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To improve readability and maintainability, consider defining these partition type UUIDs as variables in mpp-vars and referencing them here. This avoids using magic strings and makes their purpose clear. For example, you could add dps_boot_partition_type and dps_root_partition_type_riscv64 to mpp-vars.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_riscv64}'

- id: image4k
sector_size:
mpp-format-int: "{four_k_sector_size}"
Expand All @@ -89,11 +89,11 @@ mpp-define-images:
size:
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: 72EC70A6-CF74-40E6-BD49-4BDA08E8F224
Comment on lines 91 to +96
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency, please apply the same variable-based approach for partition type UUIDs in the image4k definition.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_riscv64}'

pipelines:
# If installing from container then let's pull the container file into a pipeline
- name: oci-archive
Expand Down
8 changes: 4 additions & 4 deletions src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ mpp-define-images:
label: gpt
partitions:
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
partnum: 3
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: 5EEAD9A9-FE09-4A1E-A1D7-520D00531306
partnum: 4
Comment on lines 64 to 71
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To improve readability and maintainability, consider defining these partition type UUIDs as variables in mpp-vars and referencing them here. This avoids using magic strings and makes their purpose clear. For example, you could add dps_boot_partition_type and dps_root_partition_type_s390x to mpp-vars.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
          partnum: 3
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_s390x}'
          partnum: 4

- id: image4k
sector_size:
Expand All @@ -79,12 +79,12 @@ mpp-define-images:
label: gpt
partitions:
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
partnum: 3
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: 5EEAD9A9-FE09-4A1E-A1D7-520D00531306
partnum: 4
Comment on lines 81 to 88
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency, please apply the same variable-based approach for partition type UUIDs in the image4k definition.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
          partnum: 3
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_s390x}'
          partnum: 4

pipelines:
# If installing from container then let's pull the container file into a pipeline
Expand Down
8 changes: 4 additions & 4 deletions src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ mpp-define-images:
size:
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}"
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709
Comment on lines 69 to +74
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To improve readability and maintainability, consider defining these partition type UUIDs as variables in mpp-vars and referencing them here. This avoids using magic strings and makes their purpose clear. For example, you could add dps_boot_partition_type and dps_root_partition_type_x86_64 to mpp-vars.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_x86_64}'

- id: image4k
sector_size:
mpp-format-int: "{four_k_sector_size}"
Expand All @@ -91,11 +91,11 @@ mpp-define-images:
size:
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: BC13C2FF-59E6-4262-A352-B275FD6F7172
size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
type: 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709
Comment on lines 93 to +98
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For consistency, please apply the same variable-based approach for partition type UUIDs in the image4k definition.

        - name: boot
          type:
            mpp-format-string: '{dps_boot_partition_type}'
          size:
            mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
        - name: root
          type:
            mpp-format-string: '{dps_root_partition_type_x86_64}'

pipelines:
# If installing from container then let's pull the container file into a pipeline
- name: oci-archive
Expand Down
Loading