particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RHEL-90: use XBOOTLDR partition GUID for /boot

Browse source 
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.

Ensure that when creating mountpoints, e.g. when converting the
partitions layout to LVM, the `/boot` partition get the proper GUID
assigned.

Regenerate RHEL-90 and centos-9 image test cases.

Related to https://bugzilla.redhat.com/show_bug.cgi?id=2057231
This commit is contained in:
Tomas Hozza 2022-03-23 08:34:34 +01:00 • committed by Tomáš Hozza
parent 9368b60401
commit 2ec55b4c53
31 changed files with 65 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/disk/disk.go
View file

@ -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.

7
internal/disk/partition_table.go
View file

@ -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

8
internal/distro/rhel90/partition_tables.go
View file

@ -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",

4
test/data/manifests/centos_9-aarch64-ami-boot.json
View file

@ -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"
}
],

2
test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
View file

@ -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"
},
{

4
test/data/manifests/centos_9-aarch64-openstack-boot.json
View file

@ -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"
}
],

4
test/data/manifests/centos_9-aarch64-qcow2-boot.json
View file

@ -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"
}
],

4
test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json
View file

@ -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"
}
],

4
test/data/manifests/centos_9-x86_64-ami-boot.json
View file

@ -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"
},
{

2
test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
View file

@ -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"
},
{

4
test/data/manifests/centos_9-x86_64-openstack-boot.json
View file

@ -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"
},
{

4
test/data/manifests/centos_9-x86_64-qcow2-boot.json
View file

@ -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"
},
{

4
test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json
View file

@ -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"
},
{

4
test/data/manifests/centos_9-x86_64-vhd-boot.json
View file

@ -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"
},
{

4
test/data/manifests/centos_9-x86_64-vmdk-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-aarch64-ami-boot.json
View file

@ -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"
}
],

4
test/data/manifests/rhel_90-aarch64-ec2-boot.json
View file

@ -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"
}
],

2
test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-aarch64-openstack-boot.json
View file

@ -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"
}
],

4
test/data/manifests/rhel_90-aarch64-qcow2-boot.json
View file

@ -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"
}
],

4
test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
View file

@ -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"
}
],

4
test/data/manifests/rhel_90-x86_64-ami-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-x86_64-ec2-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
View file

@ -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"
},
{

2
test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-x86_64-openstack-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-x86_64-qcow2-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-x86_64-vhd-boot.json
View file

@ -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"
},
{

4
test/data/manifests/rhel_90-x86_64-vmdk-boot.json
View file

@ -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"
},
{