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

distro/rhel90: no uuids in dos partition table

Browse source 
The unification of the partition table also introduced uuids and
types in uuid form for partition tables in dos layout, sill used
on PPC64LE and s390x. The org.osbuild.sfdisk stage did work with
that but produced a `/boot` partition with the wrong type, which
grub2 refused to read from and thus prevented boot. Fix this by
removing uuids from the dos partition tables.

Reported-by: Jakub Rusz <jrusz@redhat.com>
This commit is contained in:
Christian Kellner 2022-01-28 09:19:54 +00:00 • committed by Achilleas Koutsou
parent 88b5529cc4
commit c5feb93279
5 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,8 +113,6 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
},
{
Size: 1024000, // 500 MB
Type: disk.FilesystemDataGUID,
UUID: disk.FilesystemDataUUID,
Filesystem: &disk.Filesystem{
Type: "xfs",
Mountpoint: "/boot",
@ -141,8 +139,6 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
Partitions: []disk.Partition{
{
Size: 1024000, // 500 MB
Type: disk.FilesystemDataGUID,
UUID: disk.FilesystemDataUUID,
Filesystem: &disk.Filesystem{
Type: "xfs",
Mountpoint: "/boot",

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

@ -1027,9 +1027,7 @@
},
{
"size": 1024000,
"start": 10240,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"start": 10240
},
{
"size": 19937180,

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

@ -1373,9 +1373,7 @@
},
{
"size": 1024000,
"start": 10240,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"start": 10240
},
{
"size": 19937180,

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

@ -1102,9 +1102,7 @@
"partitions": [
{
"size": 1024000,
"start": 2048,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"start": 2048
},
{
"bootable": true,

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

@ -1432,9 +1432,7 @@
"partitions": [
{
"size": 1024000,
"start": 2048,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"start": 2048
},
{
"bootable": true,