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

osbuild2: generalise copy stage option generation

Browse source 
Use entity based method `ForEachMountable` and `getDevices` to generate
all mounts and devices in a generic way, which then allows for mounts on
arbitrarily nested devices.

Update manifests and image info:
- New device names generated by `pathdot()` to avoid basename
  collisions.
- Some partitions are generated in a different order now which changes
  the order they appear in the manifest and their UUIDs.

Co-Authored-By: Christian Kellner <christian@kellner.me>
This commit is contained in:
Achilleas Koutsou 2022-02-08 23:24:08 +01:00 • committed by Tom Gundersen
parent 16a975fe6f
commit 602111dedd
92 changed files with 356 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

42
internal/osbuild2/copy_stage.go
View file

@ -2,7 +2,6 @@ package osbuild2
import (
"fmt"
"path/filepath"
"sort"
"github.com/osbuild/osbuild-composer/internal/disk"
@ -92,38 +91,35 @@ func GenCopyFSTreeOptions(inputName, inputPipeline string, pt *disk.PartitionTab
devices := make(map[string]Device, len(pt.Partitions))
mounts := make([]Mount, 0, len(pt.Partitions))
for _, p := range pt.Partitions {
if p.Payload == nil {
// no filesystem for partition (e.g., BIOS boot)
continue
}
name := filepath.Base(p.Payload.Mountpoint)
if name == "/" {
name = "root"
}
devices[name] = *NewLoopbackDevice(
&LoopbackDeviceOptions{
Filename: devOptions.Filename,
Start: pt.BytesToSectors(p.Start),
Size: pt.BytesToSectors(p.Size),
},
)
genMounts := func(mnt disk.Mountable, path []disk.Entity) error {
stageDevices, name := getDevices(path, devOptions.Filename)
mountpoint := mnt.GetMountpoint()
var mount *Mount
switch p.Payload.Type {
t := mnt.GetFSType()
switch t {
case "xfs":
mount = NewXfsMount(name, name, p.Payload.Mountpoint)
mount = NewXfsMount(name, name, mountpoint)
case "vfat":
mount = NewFATMount(name, name, p.Payload.Mountpoint)
mount = NewFATMount(name, name, mountpoint)
case "ext4":
mount = NewExt4Mount(name, name, p.Payload.Mountpoint)
mount = NewExt4Mount(name, name, mountpoint)
case "btrfs":
mount = NewBtrfsMount(name, name, p.Payload.Mountpoint)
mount = NewBtrfsMount(name, name, mountpoint)
default:
panic("unknown fs type " + p.Type)
panic("unknown fs type " + t)
}
mounts = append(mounts, *mount)
// update devices map with new elements from stageDevices
for devName := range stageDevices {
devices[devName] = stageDevices[devName]
}
return nil
}
_ = pt.ForEachMountable(genMounts)
// sort the mounts, using < should just work because:
// - a parent directory should be always before its children:
// / < /boot

8
test/data/manifests/centos_8-aarch64-ami-boot.json
View file

@ -1208,7 +1208,7 @@
"size": 1048576
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1239,9 +1239,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11283,7 +11283,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 9989732352,
"size": 9989766656,
"start": 747634688,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

8
test/data/manifests/centos_8-aarch64-openstack-boot.json
View file

@ -1096,7 +1096,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1121,9 +1121,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11563,7 +11563,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 4189009920,
"size": 4189044224,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/centos_8-aarch64-qcow2-boot.json
View file

@ -1095,7 +1095,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1120,9 +1120,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11503,7 +11503,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10631460864,
"size": 10631495168,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json
View file

@ -1394,7 +1394,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1419,9 +1419,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -13833,7 +13833,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10631460864,
"size": 10631495168,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/centos_8-ppc64le-qcow2-boot.json
View file

@ -12259,7 +12259,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-02",
"size": 10732124160,
"size": 10732175360,
"start": 5242880,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json
View file

@ -15139,7 +15139,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-02",
"size": 10732124160,
"size": 10732175360,
"start": 5242880,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/centos_8-x86_64-ami-boot.json
View file

@ -10808,7 +10808,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10735269888,
"size": 10735304192,
"start": 2097152,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/centos_8-x86_64-openstack-boot.json
View file

@ -1117,7 +1117,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1142,9 +1142,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11765,7 +11765,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 4187961344,
"size": 4187995648,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/centos_8-x86_64-qcow2-boot.json
View file

@ -1114,7 +1114,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1139,9 +1139,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11675,7 +11675,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10630412288,
"size": 10630446592,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json
View file

@ -1415,7 +1415,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1440,9 +1440,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -14031,7 +14031,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10630412288,
"size": 10630446592,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/centos_8-x86_64-vhd-boot.json
View file

@ -1128,7 +1128,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1153,9 +1153,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11830,7 +11830,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 4187961344,
"size": 4187995648,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/centos_8-x86_64-vmdk-boot.json
View file

@ -1086,7 +1086,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1111,9 +1111,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11256,7 +11256,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 4187961344,
"size": 4187995648,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

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

@ -1122,7 +1122,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1153,9 +1153,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10213,7 +10213,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10002315264,
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1029,7 +1029,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1060,9 +1060,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10255,7 +10255,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 3559864320,
"size": 3559898624,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1037,7 +1037,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1068,9 +1068,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10333,7 +10333,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10002315264,
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1348,7 +1348,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1379,9 +1379,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -12714,7 +12714,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10002315264,
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

2
test/data/manifests/centos_9-ppc64le-qcow2-boot.json
View file

@ -11228,7 +11228,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-03",
"size": 10207836160,
"size": 10207887360,
"start": 529530880,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

2
test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json
View file

@ -13686,7 +13686,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-03",
"size": 10207836160,
"size": 10207887360,
"start": 529530880,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -11455,7 +11455,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220215195140-5.14.0-55.el9.s390x",
"id": "-20220219190204-5.14.0-55.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
@ -12209,7 +12209,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-02",
"size": 10212030464,
"size": 10212081664,
"start": 525336576,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

6
test/data/manifests/centos_9-s390x-qcow2_customize-boot.json
View file

@ -13689,7 +13689,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220215195343-0-rescue-ffffffffffffffffffffffffffffffff",
"id": "-20220219190404-0-rescue-ffffffffffffffffffffffffffffffff",
"initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
"linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
@ -13700,7 +13700,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220215195343-5.14.0-55.el9.s390x",
"id": "-20220219190404-5.14.0-55.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
@ -14481,7 +14481,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-02",
"size": 10212030464,
"size": 10212081664,
"start": 525336576,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1125,7 +1125,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1156,9 +1156,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -9900,7 +9900,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1076,7 +1076,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1107,9 +1107,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10725,7 +10725,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 3558815744,
"size": 3558850048,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1071,7 +1071,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1102,9 +1102,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10608,7 +10608,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1397,7 +1397,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1428,9 +1428,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -13202,7 +13202,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1075,7 +1075,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1106,9 +1106,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10619,7 +10619,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 3558815744,
"size": 3558850048,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1042,7 +1042,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1073,9 +1073,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10174,7 +10174,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 3558815744,
"size": 3558850048,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

22
test/data/manifests/rhel_8-aarch64-ami-boot.json
View file

@ -9145,25 +9145,25 @@
"partition-table": "gpt",
"partition-table-id": "8DFDFF87-C96E-EA48-A3A6-9408F1F6B1EF",
"partitions": [
{
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "7CEC5879-020E-9F4B-A44D-928D0A8BAAEE",
"size": 5942263296,
"start": 500170752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0bd700f8-090f-4556-b797-b340297ea1bd"
},
{
"bootable": false,
"fstype": "vfat",
"label": "EFI\\ System",
"partuuid": "EB0B4FC0-0920-FB49-94B1-8D41B171E1CA",
"partuuid": "9F7ACD3B-81D5-3C46-8FAF-694468069EB0",
"size": 498073600,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "46BB-8120"
},
{
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "FE0B2159-8510-1C42-A227-2B64998C3680",
"size": 5942263296,
"start": 500170752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0bd700f8-090f-4556-b797-b340297ea1bd"
}
],
"passwd": [

22
test/data/manifests/rhel_8-aarch64-openstack-boot.json
View file

@ -9743,25 +9743,25 @@
"partition-table": "gpt",
"partition-table-id": "8DFDFF87-C96E-EA48-A3A6-9408F1F6B1EF",
"partitions": [
{
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "A6240362-CE77-EB45-8F4E-9280C6357EE1",
"size": 3794779648,
"start": 500170752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0bd700f8-090f-4556-b797-b340297ea1bd"
},
{
"bootable": false,
"fstype": "vfat",
"label": "EFI\\ System",
"partuuid": "E983D456-8F48-964F-9AEC-E51120DE1F70",
"partuuid": "09C4564F-7EC3-BF43-A87A-D345C10A2853",
"size": 498073600,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "46BB-8120"
},
{
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "11D5B640-F5A6-CD42-899F-97FC4AE38D72",
"size": 3794779648,
"start": 500170752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0bd700f8-090f-4556-b797-b340297ea1bd"
}
],
"passwd": [

22
test/data/manifests/rhel_8-aarch64-qcow2-boot.json
View file

@ -10237,25 +10237,25 @@
"partition-table": "gpt",
"partition-table-id": "8DFDFF87-C96E-EA48-A3A6-9408F1F6B1EF",
"partitions": [
{
"bootable": false,
"fstype": "vfat",
"label": "EFI\\ System",
"partuuid": "26279506-8D85-534C-B2D3-051E3FE19E1A",
"size": 498073600,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "46BB-8120"
},
{
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "468A705D-7634-B040-9F79-1A976E043FEF",
"partuuid": "5CA73169-8DBC-FF48-8AC3-F7B877B2696F",
"size": 3794779648,
"start": 500170752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0bd700f8-090f-4556-b797-b340297ea1bd"
},
{
"bootable": false,
"fstype": "vfat",
"label": "EFI\\ System",
"partuuid": "F6D7B645-6A6E-8548-96BB-18DDFDEEF9AF",
"size": 498073600,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "46BB-8120"
}
],
"passwd": [

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

@ -10371,7 +10371,7 @@
"bootable": false,
"fstype": "vfat",
"label": "EFI\\ System",
"partuuid": "0566FDB8-5C6B-4D4E-B9AD-354D05CE1A95",
"partuuid": "2DB26B1B-1377-7A44-9D22-14A84442B2DA",
"size": 498073600,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
@ -10381,7 +10381,7 @@
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "D2795D04-7480-AA46-8A32-26B11C45BE39",
"partuuid": "4AB466C8-F230-F640-9A96-473D2E9EED1F",
"size": 3794779648,
"start": 500170752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",

6
test/data/manifests/rhel_85-aarch64-ami-boot.json
View file

@ -1237,7 +1237,7 @@
"size": 1048576
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1268,9 +1268,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_85-aarch64-ec2-boot.json
View file

@ -1251,7 +1251,7 @@
"size": 1048576
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1282,9 +1282,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_85-aarch64-openstack-boot.json
View file

@ -1111,7 +1111,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1136,9 +1136,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_85-aarch64-qcow2-boot.json
View file

@ -1127,7 +1127,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1152,9 +1152,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

32
test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json
View file

@ -1517,7 +1517,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1558,9 +1558,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
},
{
@ -12623,7 +12623,7 @@
"70-persistent-ipoib.rules": []
},
"boot-environment": {
"kernelopts": "root=UUID=e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-325.el8.aarch64"
},
"bootloader": "unknown",
@ -12814,6 +12814,14 @@
"fstab": [
[
"UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"/",
"xfs",
"defaults",
"0",
"0"
],
[
"UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"/usr",
"xfs",
"defaults",
@ -12828,14 +12836,6 @@
"0",
"2"
],
[
"UUID=e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1",
"/",
"xfs",
"defaults",
"0",
"0"
],
[
"UUID=fb180daf-48a7-4ee0-b10d-394651850fd4",
"/var",
@ -13435,7 +13435,7 @@
"size": 7410235392,
"start": 3327131648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1"
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
},
{
"bootable": false,
@ -13451,17 +13451,17 @@
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "6E4FF95F-F662-45EE-A82A-BDF44A2D0B75",
"partuuid": "A178892E-E285-4CE1-9114-55780875D64E",
"size": 2147483648,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
},
{
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "A178892E-E285-4CE1-9114-55780875D64E",
"partuuid": "E2D3D0D0-DE6B-48F9-B44C-E85FF044C6B1",
"size": 1073741824,
"start": 2253389824,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",

14
test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json
View file

@ -13807,7 +13807,7 @@
]
},
"boot-environment": {
"kernelopts": "root=UUID=fb180daf-48a7-4ee0-b10d-394651850fd4 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.ppc64le"
},
"bootloader": "unknown",
@ -13994,7 +13994,7 @@
"fstab": [
[
"UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"/usr",
"/",
"xfs",
"defaults",
"0",
@ -14002,7 +14002,7 @@
],
[
"UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"/var",
"/usr",
"xfs",
"defaults",
"0",
@ -14010,7 +14010,7 @@
],
[
"UUID=fb180daf-48a7-4ee0-b10d-394651850fd4",
"/",
"/var",
"xfs",
"defaults",
"0",
@ -14657,7 +14657,7 @@
"size": 7510898688,
"start": 3226468352,
"type": "83",
"uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4"
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
},
{
"bootable": false,
@ -14667,7 +14667,7 @@
"size": 2147483648,
"start": 5242880,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
},
{
"bootable": false,
@ -14677,7 +14677,7 @@
"size": 1073741824,
"start": 2152726528,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
"uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4"
}
],
"passwd": [

16
test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json
View file

@ -13982,7 +13982,7 @@
"id": "rhel-20210322163432-0-rescue-ffffffffffffffffffffffffffffffff",
"initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
"linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
"options": "root=UUID=fb180daf-48a7-4ee0-b10d-394651850fd4 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
"options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
"title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 8.5 (Ootpa)",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -13993,7 +13993,7 @@
"id": "rhel-20210322163432-4.18.0-299.1.el8.s390x",
"initrd": "/boot/initramfs-4.18.0-299.1.el8.s390x.img",
"linux": "/boot/vmlinuz-4.18.0-299.1.el8.s390x",
"options": "root=UUID=fb180daf-48a7-4ee0-b10d-394651850fd4 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
"options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
"title": "Red Hat Enterprise Linux (4.18.0-299.1.el8.s390x) 8.5 (Ootpa)",
"version": "4.18.0-299.1.el8.s390x"
}
@ -14157,7 +14157,7 @@
"fstab": [
[
"UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"/usr",
"/",
"xfs",
"defaults",
"0",
@ -14165,7 +14165,7 @@
],
[
"UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"/var",
"/usr",
"xfs",
"defaults",
"0",
@ -14173,7 +14173,7 @@
],
[
"UUID=fb180daf-48a7-4ee0-b10d-394651850fd4",
"/",
"/var",
"xfs",
"defaults",
"0",
@ -14790,7 +14790,7 @@
"size": 7515092992,
"start": 3222274048,
"type": "83",
"uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4"
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
},
{
"bootable": false,
@ -14800,7 +14800,7 @@
"size": 2147483648,
"start": 1048576,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
},
{
"bootable": false,
@ -14810,7 +14810,7 @@
"size": 1073741824,
"start": 2148532224,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
"uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4"
}
],
"passwd": [

2
test/data/manifests/rhel_85-s390x-tar-boot.json
View file

@ -8478,7 +8478,7 @@
"id": "rhel-20210322163432-4.18.0-299.1.el8.s390x",
"initrd": "/boot/initramfs-4.18.0-299.1.el8.s390x.img",
"linux": "/boot/vmlinuz-4.18.0-299.1.el8.s390x",
"options": "root=UUID=b9867d4e-38c1-4bed-a75d-57debfed3565 rootflags=subvol=root",
"options": "root=/dev/mapper/cs_s390x--kvm--025-root crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M rd.lvm.lv=cs_s390x-kvm-025/root rd.lvm.lv=cs_s390x-kvm-025/swap",
"title": "Red Hat Enterprise Linux (4.18.0-299.1.el8.s390x) 8.5 (Ootpa)",
"version": "4.18.0-299.1.el8.s390x"
}

6
test/data/manifests/rhel_85-x86_64-openstack-boot.json
View file

@ -1134,7 +1134,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1159,9 +1159,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_85-x86_64-qcow2-boot.json
View file

@ -1147,7 +1147,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1172,9 +1172,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

32
test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json
View file

@ -1541,7 +1541,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1582,9 +1582,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
},
{
@ -12834,7 +12834,7 @@
"70-persistent-ipoib.rules": []
},
"boot-environment": {
"kernelopts": "root=UUID=e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-325.el8.x86_64"
},
"bootloader": "grub",
@ -13028,6 +13028,14 @@
"fstab": [
[
"UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"/",
"xfs",
"defaults",
"0",
"0"
],
[
"UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"/usr",
"xfs",
"defaults",
@ -13042,14 +13050,6 @@
"0",
"2"
],
[
"UUID=e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1",
"/",
"xfs",
"defaults",
"0",
"0"
],
[
"UUID=fb180daf-48a7-4ee0-b10d-394651850fd4",
"/var",
@ -13654,7 +13654,7 @@
"size": 7409186816,
"start": 3328180224,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "e2d3d0d0-de6b-48f9-b44c-e85ff044c6b1"
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
},
{
"bootable": false,
@ -13670,17 +13670,17 @@
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "6E4FF95F-F662-45EE-A82A-BDF44A2D0B75",
"partuuid": "A178892E-E285-4CE1-9114-55780875D64E",
"size": 2147483648,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
},
{
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "A178892E-E285-4CE1-9114-55780875D64E",
"partuuid": "E2D3D0D0-DE6B-48F9-B44C-E85FF044C6B1",
"size": 1073741824,
"start": 2254438400,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",

6
test/data/manifests/rhel_85-x86_64-vhd-boot.json
View file

@ -1145,7 +1145,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1170,9 +1170,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_85-x86_64-vmdk-boot.json
View file

@ -1108,7 +1108,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1133,9 +1133,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

8
test/data/manifests/rhel_86-aarch64-ami-boot.json
View file

@ -1237,7 +1237,7 @@
"size": 1048576
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1268,9 +1268,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10768,7 +10768,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 9989732352,
"size": 9989766656,
"start": 747634688,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

8
test/data/manifests/rhel_86-aarch64-ec2-boot.json
View file

@ -1251,7 +1251,7 @@
"size": 1048576
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1282,9 +1282,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10818,7 +10818,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 9989732352,
"size": 9989766656,
"start": 747634688,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

8
test/data/manifests/rhel_86-aarch64-openstack-boot.json
View file

@ -1118,7 +1118,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1143,9 +1143,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11045,7 +11045,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 4189009920,
"size": 4189044224,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/rhel_86-aarch64-qcow2-boot.json
View file

@ -1127,7 +1127,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1152,9 +1152,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10963,7 +10963,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10631460864,
"size": 10631495168,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json
View file

@ -1447,7 +1447,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1472,9 +1472,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -13323,7 +13323,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10631460864,
"size": 10631495168,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/rhel_86-ppc64le-qcow2-boot.json
View file

@ -11669,7 +11669,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-02",
"size": 10732124160,
"size": 10732175360,
"start": 5242880,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json
View file

@ -14539,7 +14539,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-02",
"size": 10732124160,
"size": 10732175360,
"start": 5242880,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/rhel_86-s390x-qcow2-boot.json
View file

@ -12304,7 +12304,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-01",
"size": 10736318464,
"size": 10736369664,
"start": 1048576,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json
View file

@ -14574,7 +14574,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-01",
"size": 10736318464,
"size": 10736369664,
"start": 1048576,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/rhel_86-s390x-tar-boot.json
View file

@ -8198,7 +8198,7 @@
"id": "rhel-20220124154823-4.18.0-361.el8.s390x",
"initrd": "/boot/initramfs-4.18.0-361.el8.s390x.img",
"linux": "/boot/vmlinuz-4.18.0-361.el8.s390x",
"options": "root=/dev/mapper/cs_s390x--kvm--018-root crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M rd.lvm.lv=cs_s390x-kvm-018/root rd.lvm.lv=cs_s390x-kvm-018/swap",
"options": "root=/dev/mapper/cs_s390x--kvm--025-root crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M rd.lvm.lv=cs_s390x-kvm-025/root rd.lvm.lv=cs_s390x-kvm-025/swap",
"title": "Red Hat Enterprise Linux (4.18.0-361.el8.s390x) 8.6 (Ootpa)",
"version": "4.18.0-361.el8.s390x"
}

2
test/data/manifests/rhel_86-x86_64-ami-boot.json
View file

@ -10389,7 +10389,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10735269888,
"size": 10735304192,
"start": 2097152,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/rhel_86-x86_64-ec2-boot.json
View file

@ -10441,7 +10441,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10735269888,
"size": 10735304192,
"start": 2097152,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

2
test/data/manifests/rhel_86-x86_64-ec2_sap-boot.json
View file

@ -13710,7 +13710,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10735269888,
"size": 10735304192,
"start": 2097152,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/rhel_86-x86_64-openstack-boot.json
View file

@ -1141,7 +1141,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1166,9 +1166,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11262,7 +11262,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 4187961344,
"size": 4187995648,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/rhel_86-x86_64-qcow2-boot.json
View file

@ -1147,7 +1147,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1172,9 +1172,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11138,7 +11138,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10630412288,
"size": 10630446592,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json
View file

@ -1471,7 +1471,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1496,9 +1496,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -13542,7 +13542,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10630412288,
"size": 10630446592,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/rhel_86-x86_64-vhd-boot.json
View file

@ -1144,7 +1144,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1169,9 +1169,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -11211,7 +11211,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 4187961344,
"size": 4187995648,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

8
test/data/manifests/rhel_86-x86_64-vmdk-boot.json
View file

@ -1107,7 +1107,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1132,9 +1132,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10724,7 +10724,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 4187961344,
"size": 4187995648,
"start": 106954752,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"

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

@ -1145,7 +1145,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1176,9 +1176,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -9720,7 +9720,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10002315264,
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1160,7 +1160,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1191,9 +1191,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -9784,7 +9784,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10002315264,
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1039,7 +1039,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1070,9 +1070,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -9700,7 +9700,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 3559864320,
"size": 3559898624,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1065,7 +1065,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1096,9 +1096,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -9856,7 +9856,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10002315264,
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1398,7 +1398,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1429,9 +1429,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -12257,7 +12257,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10002315264,
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -10717,7 +10717,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-03",
"size": 10207836160,
"size": 10207887360,
"start": 529530880,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -13198,7 +13198,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-03",
"size": 10207836160,
"size": 10207887360,
"start": 529530880,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -10825,7 +10825,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220215155517-5.14.0-55.el9.s390x",
"id": "-20220219194703-5.14.0-55.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
@ -11598,7 +11598,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-02",
"size": 10212030464,
"size": 10212081664,
"start": 525336576,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -13089,7 +13089,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220215155748-0-rescue-ffffffffffffffffffffffffffffffff",
"id": "-20220219194907-0-rescue-ffffffffffffffffffffffffffffffff",
"initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
"linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
@ -13100,7 +13100,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220215155748-5.14.0-55.el9.s390x",
"id": "-20220219194907-5.14.0-55.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
@ -13900,7 +13900,7 @@
"fstype": "xfs",
"label": null,
"partuuid": "14fc63d2-02",
"size": 10212030464,
"size": 10212081664,
"start": 525336576,
"type": "83",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1143,7 +1143,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1174,9 +1174,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -9462,7 +9462,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1160,7 +1160,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1191,9 +1191,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -9528,7 +9528,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1358,7 +1358,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1389,9 +1389,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -12162,7 +12162,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1583,7 +1583,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1614,9 +1614,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -13532,7 +13532,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1080,7 +1080,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1111,9 +1111,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10158,7 +10158,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 3558815744,
"size": 3558850048,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1092,7 +1092,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1123,9 +1123,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10118,7 +10118,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1442,7 +1442,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1473,9 +1473,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -12737,7 +12737,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 10001266688,
"size": 10001300992,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1079,7 +1079,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1110,9 +1110,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -10060,7 +10060,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 3558815744,
"size": 3558850048,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

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

@ -1052,7 +1052,7 @@
"size": 1024000
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1083,9 +1083,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]
@ -9704,7 +9704,7 @@
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"size": 3558815744,
"size": 3558850048,
"start": 736100352,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"

6
test/data/manifests/rhel_90_beta-aarch64-ami-boot.json
View file

@ -1141,7 +1141,7 @@
"size": 1048576
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1172,9 +1172,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_90_beta-aarch64-ec2-boot.json
View file

@ -1155,7 +1155,7 @@
"size": 1048576
}
},
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "image.raw",
@ -1186,9 +1186,9 @@
"target": "/boot"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_90_beta-aarch64-openstack-boot.json
View file

@ -1005,7 +1005,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1030,9 +1030,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_90_beta-aarch64-qcow2-boot.json
View file

@ -1027,7 +1027,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1052,9 +1052,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_90_beta-aarch64-qcow2_customize-boot.json
View file

@ -1367,7 +1367,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1392,9 +1392,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

2
test/data/manifests/rhel_90_beta-s390x-qcow2-boot.json
View file

@ -10792,7 +10792,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220214182505-5.14.0-4.el9.s390x",
"id": "-20220219155539-5.14.0-4.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-4.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-4.el9.s390x",
"options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",

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

@ -13126,7 +13126,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220214182709-0-rescue-ffffffffffffffffffffffffffffffff",
"id": "-20220219155739-0-rescue-ffffffffffffffffffffffffffffffff",
"initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
"linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
"options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
@ -13137,7 +13137,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220214182709-5.14.0-4.el9.s390x",
"id": "-20220219155739-5.14.0-4.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-4.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-4.el9.s390x",
"options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",

6
test/data/manifests/rhel_90_beta-x86_64-openstack-boot.json
View file

@ -1045,7 +1045,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1070,9 +1070,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_90_beta-x86_64-qcow2-boot.json
View file

@ -1053,7 +1053,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1078,9 +1078,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_90_beta-x86_64-qcow2_customize-boot.json
View file

@ -1410,7 +1410,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1435,9 +1435,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_90_beta-x86_64-vhd-boot.json
View file

@ -1044,7 +1044,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1069,9 +1069,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]

6
test/data/manifests/rhel_90_beta-x86_64-vmdk-boot.json
View file

@ -1017,7 +1017,7 @@
]
},
"devices": {
"efi": {
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
@ -1042,9 +1042,9 @@
"target": "/"
},
{
"name": "efi",
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "efi",
"source": "boot.efi",
"target": "/boot/efi"
}
]