Repository: osbuild/osbuild-composer
Pull request #2473 (2022-03-23 09:35:44)

RHEL-90: use XBOOTLDR partition GUID for `/boot`
Use the Extended Bootloader Partition GUID for `/boot`, instead of the
Linux filesystem data GUID. This is useful for autodetection of a
partition purpose based on its GUID without reading the `/etc/fstab`
first.

Related to https://bugzilla.redhat.com/show_bug.cgi?id=2057231


This pull request includes:

- [ ] adequate testing for the new functionality or fixed issue
- [ ] adequate documentation informing people about the change such as
  - [ ] submit a PR for the [guides](https://github.com/osbuild/guides) repository if this PR changed any behavior described there: https://www.osbuild.org/guides/

<!--
Thanks for proposing a change to osbuild-composer!

Please don't remove the above check list. These are things that each pull
request must have before it is merged. It helps maintainers to not forget
anything.

If the reason for ticking any of the boxes is ambiguous, please add a short
note explaining why.

In addition, if this pull request fixes a downstream issue, please refer to
test/README.md and add these additional items:

- [ ] 1st commit of any `rhbz#` related PR contains bug reproducer; CI reports FAIL or
- [ ] PR contains automated tests for new functionality and
- [ ] QE has approved reproducer/new tests and
- [ ] Subsequent commits provide bug fixes without modifying the reproducer; CI reports PASS and
- [ ] QE approves this PR; RHBZ status is set to `MODIFIED + Verified=Tested`

Information regarding our GitLab pipeline (Schutzbot):

CI will not be ran automatically if WIP label is applied or the PR is in DRAFT state, instead only
a link will be provided to the pipeline which can then be triggered manually if desired. To run the
CI automatically either switch the PR to ready or apply WIP+test label.

Outside contributors need manual approval from one of the osbuild-composer maintainers.

Schutzbot will only be triggered if all Tests jobs in GitHub workflow succeed.
-->



Patch:
diff --git a/internal/disk/disk.go b/internal/disk/disk.go
index 3024071f2..6a6f0a38d 100644
--- a/internal/disk/disk.go
+++ b/internal/disk/disk.go
@@ -45,6 +45,9 @@ const (
 	PRePartitionGUID = "9E1A2D38-C612-4316-AA26-8B49521E5A8B"
 
 	RootPartitionUUID = "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
+
+	// Extended Boot Loader Partition
+	XBootLDRPartitionGUID = "BC13C2FF-59E6-4262-A352-B275FD6F7172"
 )
 
 // Entity is the base interface for all disk-related entities.
diff --git a/internal/disk/partition_table.go b/internal/disk/partition_table.go
index 339d608c3..d61c0931a 100644
--- a/internal/disk/partition_table.go
+++ b/internal/disk/partition_table.go
@@ -179,7 +179,12 @@ func (pt *PartitionTable) CreateMountpoint(mountpoint string, size uint64) (Enti
 	var maxNo int
 
 	if pt.Type == "gpt" {
-		partition.Type = FilesystemDataGUID
+		switch mountpoint {
+		case "/boot":
+			partition.Type = XBootLDRPartitionGUID
+		default:
+			partition.Type = FilesystemDataGUID
+		}
 		maxNo = 128
 	} else {
 		maxNo = 4
diff --git a/internal/distro/rhel90/partition_tables.go b/internal/distro/rhel90/partition_tables.go
index 6f52d1a50..e8183bb58 100644
--- a/internal/distro/rhel90/partition_tables.go
+++ b/internal/distro/rhel90/partition_tables.go
@@ -32,7 +32,7 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
 			},
 			{
 				Size: 524288000, // 500 MB
-				Type: disk.FilesystemDataGUID,
+				Type: disk.XBootLDRPartitionGUID,
 				UUID: disk.FilesystemDataUUID,
 				Payload: &disk.Filesystem{
 					Type:         "xfs",
@@ -78,7 +78,7 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
 			},
 			{
 				Size: 524288000, // 500 MB
-				Type: disk.FilesystemDataGUID,
+				Type: disk.XBootLDRPartitionGUID,
 				UUID: disk.FilesystemDataUUID,
 				Payload: &disk.Filesystem{
 					Type:         "xfs",
@@ -193,7 +193,7 @@ var edgeBasePartitionTables = distro.BasePartitionTableMap{
 			},
 			{
 				Size: 402653184, // 384 MB
-				Type: disk.FilesystemDataGUID,
+				Type: disk.XBootLDRPartitionGUID,
 				UUID: disk.FilesystemDataUUID,
 				Payload: &disk.Filesystem{
 					Type:         "xfs",
@@ -253,7 +253,7 @@ var edgeBasePartitionTables = distro.BasePartitionTableMap{
 			},
 			{
 				Size: 402653184, // 384 MB
-				Type: disk.FilesystemDataGUID,
+				Type: disk.XBootLDRPartitionGUID,
 				UUID: disk.FilesystemDataUUID,
 				Payload: &disk.Filesystem{
 					Type:         "xfs",
diff --git a/templates/composer.yml b/templates/composer.yml
index 09ef60568..16f0d170e 100644
--- a/templates/composer.yml
+++ b/templates/composer.yml
@@ -202,7 +202,7 @@ objects:
       - claim: user_id
         pattern: ^(54629121|54629180|54597799|54676085|54968801)$
       - claim: rh-org-id
-        pattern: ^(13826359|15842261|15877963)$
+        pattern: ^(13826359|15842261|15877963|15885990)$
       - claim: account_id
         pattern: ^(15842261)$
     osbuild-composer.toml: |


Test patch:
diff --git a/test/data/manifests/centos_9-aarch64-ami-boot.json b/test/data/manifests/centos_9-aarch64-ami-boot.json
index 018c98df1..d1d515b40 100644
--- a/test/data/manifests/centos_9-aarch64-ami-boot.json
+++ b/test/data/manifests/centos_9-aarch64-ami-boot.json
@@ -1029,7 +1029,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10308,7 +10308,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
index d93db5e85..db75b2464 100644
--- a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
@@ -538,7 +538,7 @@
                 {
                   "size": 786432,
                   "start": 262144,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
diff --git a/test/data/manifests/centos_9-aarch64-openstack-boot.json b/test/data/manifests/centos_9-aarch64-openstack-boot.json
index 9f34b00e7..f1ba71c5a 100644
--- a/test/data/manifests/centos_9-aarch64-openstack-boot.json
+++ b/test/data/manifests/centos_9-aarch64-openstack-boot.json
@@ -936,7 +936,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10350,7 +10350,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/centos_9-aarch64-qcow2-boot.json b/test/data/manifests/centos_9-aarch64-qcow2-boot.json
index cc2f3d939..abbb5495c 100644
--- a/test/data/manifests/centos_9-aarch64-qcow2-boot.json
+++ b/test/data/manifests/centos_9-aarch64-qcow2-boot.json
@@ -944,7 +944,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10428,7 +10428,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json
index b364d4b34..00ebccf47 100644
--- a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json
@@ -1255,7 +1255,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -12809,7 +12809,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/centos_9-x86_64-ami-boot.json b/test/data/manifests/centos_9-x86_64-ami-boot.json
index 515a512cb..0f45d6a3a 100644
--- a/test/data/manifests/centos_9-x86_64-ami-boot.json
+++ b/test/data/manifests/centos_9-x86_64-ami-boot.json
@@ -1032,7 +1032,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -9995,7 +9995,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
index 113d8bfa1..de63a441e 100644
--- a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
@@ -560,7 +560,7 @@
                 {
                   "size": 786432,
                   "start": 264192,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
diff --git a/test/data/manifests/centos_9-x86_64-openstack-boot.json b/test/data/manifests/centos_9-x86_64-openstack-boot.json
index aef809c4b..50bf049cf 100644
--- a/test/data/manifests/centos_9-x86_64-openstack-boot.json
+++ b/test/data/manifests/centos_9-x86_64-openstack-boot.json
@@ -984,7 +984,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10821,7 +10821,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/centos_9-x86_64-qcow2-boot.json b/test/data/manifests/centos_9-x86_64-qcow2-boot.json
index c994dbf09..2f00a0c49 100644
--- a/test/data/manifests/centos_9-x86_64-qcow2-boot.json
+++ b/test/data/manifests/centos_9-x86_64-qcow2-boot.json
@@ -979,7 +979,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10704,7 +10704,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json
index 787eff836..470bb384b 100644
--- a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json
@@ -1305,7 +1305,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -13298,7 +13298,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/centos_9-x86_64-vhd-boot.json b/test/data/manifests/centos_9-x86_64-vhd-boot.json
index d3e7cef2a..8f389075b 100644
--- a/test/data/manifests/centos_9-x86_64-vhd-boot.json
+++ b/test/data/manifests/centos_9-x86_64-vhd-boot.json
@@ -983,7 +983,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10715,7 +10715,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/centos_9-x86_64-vmdk-boot.json b/test/data/manifests/centos_9-x86_64-vmdk-boot.json
index 187bbd838..f52a9da2f 100644
--- a/test/data/manifests/centos_9-x86_64-vmdk-boot.json
+++ b/test/data/manifests/centos_9-x86_64-vmdk-boot.json
@@ -950,7 +950,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10270,7 +10270,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-aarch64-ami-boot.json b/test/data/manifests/rhel_90-aarch64-ami-boot.json
index c4a9c7155..9dbba55b2 100644
--- a/test/data/manifests/rhel_90-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-ami-boot.json
@@ -1052,7 +1052,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -9810,7 +9810,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/rhel_90-aarch64-ec2-boot.json b/test/data/manifests/rhel_90-aarch64-ec2-boot.json
index 2374d15f6..6550384ba 100644
--- a/test/data/manifests/rhel_90-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-ec2-boot.json
@@ -1067,7 +1067,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -9874,7 +9874,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
index e6b8d94da..63cb09cd5 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
@@ -536,7 +536,7 @@
                 {
                   "size": 786432,
                   "start": 262144,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
diff --git a/test/data/manifests/rhel_90-aarch64-openstack-boot.json b/test/data/manifests/rhel_90-aarch64-openstack-boot.json
index 9454d02ed..abe0593de 100644
--- a/test/data/manifests/rhel_90-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-openstack-boot.json
@@ -946,7 +946,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -9790,7 +9790,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
index 91fb338bb..0c47503e9 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
@@ -972,7 +972,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -9946,7 +9946,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
index 2830f8543..d78aa9738 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
@@ -1305,7 +1305,7 @@
                 {
                   "size": 1024000,
                   "start": 411648,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -12347,7 +12347,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 210763776,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       }
     ],
diff --git a/test/data/manifests/rhel_90-x86_64-ami-boot.json b/test/data/manifests/rhel_90-x86_64-ami-boot.json
index dec8a5d70..4defa9d10 100644
--- a/test/data/manifests/rhel_90-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ami-boot.json
@@ -1050,7 +1050,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -9552,7 +9552,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-x86_64-ec2-boot.json b/test/data/manifests/rhel_90-x86_64-ec2-boot.json
index 6eeae7a3d..fd6a5d7bc 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2-boot.json
@@ -1067,7 +1067,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -9618,7 +9618,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
index 217ed209f..096df21ac 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
@@ -1265,7 +1265,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -12237,7 +12237,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
index e49181eaf..d73e161a0 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
@@ -1490,7 +1490,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -13622,7 +13622,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
index da4e00841..8ad87a407 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
@@ -551,7 +551,7 @@
                 {
                   "size": 786432,
                   "start": 264192,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
diff --git a/test/data/manifests/rhel_90-x86_64-openstack-boot.json b/test/data/manifests/rhel_90-x86_64-openstack-boot.json
index 2cd47ab65..8f135733d 100644
--- a/test/data/manifests/rhel_90-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-openstack-boot.json
@@ -988,7 +988,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10249,7 +10249,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
index 8ea7086e1..b0a5195ac 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
@@ -1000,7 +1000,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10209,7 +10209,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
index 1186b63bc..abf9e2bf3 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
@@ -1350,7 +1350,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -12828,7 +12828,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-x86_64-vhd-boot.json b/test/data/manifests/rhel_90-x86_64-vhd-boot.json
index 6d45ec702..7e63d61bf 100644
--- a/test/data/manifests/rhel_90-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-vhd-boot.json
@@ -987,7 +987,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -10151,7 +10151,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {
diff --git a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
index a9fc2e791..6dc2ad9cb 100644
--- a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
@@ -960,7 +960,7 @@
                 {
                   "size": 1024000,
                   "start": 413696,
-                  "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                  "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
                   "uuid": "CB07C243-BC44-4717-853E-28852021225B"
                 },
                 {
@@ -9795,7 +9795,7 @@
         "partuuid": "CB07C243-BC44-4717-853E-28852021225B",
         "size": 524288000,
         "start": 211812352,
-        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+        "type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
         "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
       },
       {