From d115baec033a20f9c91ca0df7faf9bd095fb6c51 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Mon, 22 Nov 2021 16:37:51 +0100 Subject: [PATCH] Regenerate image test cases Signed-off-by: Tomas Hozza --- .../manifests/rhel_90-aarch64-ami-boot.json | 29 +-- .../manifests/rhel_90-aarch64-ec2-boot.json | 29 +-- .../rhel_90-aarch64-openstack-boot.json | 104 ++++++++--- .../manifests/rhel_90-aarch64-qcow2-boot.json | 104 ++++++++--- .../rhel_90-aarch64-qcow2_customize-boot.json | 110 +++++++++--- .../manifests/rhel_90-ppc64le-qcow2-boot.json | 98 +++++++++-- .../rhel_90-ppc64le-qcow2_customize-boot.json | 104 ++++++++--- .../manifests/rhel_90-s390x-qcow2-boot.json | 116 +++++++++--- .../rhel_90-s390x-qcow2_customize-boot.json | 120 ++++++++++--- .../manifests/rhel_90-x86_64-ami-boot.json | 165 +++++++++++++++--- .../manifests/rhel_90-x86_64-ec2-boot.json | 165 +++++++++++++++--- .../manifests/rhel_90-x86_64-ec2_ha-boot.json | 165 +++++++++++++++--- .../rhel_90-x86_64-ec2_sap-boot.json | 165 +++++++++++++++--- .../rhel_90-x86_64-openstack-boot.json | 106 ++++++++--- .../manifests/rhel_90-x86_64-qcow2-boot.json | 106 ++++++++--- .../rhel_90-x86_64-qcow2_customize-boot.json | 112 +++++++++--- .../manifests/rhel_90-x86_64-vhd-boot.json | 106 ++++++++--- .../manifests/rhel_90-x86_64-vmdk-boot.json | 106 ++++++++--- 18 files changed, 1646 insertions(+), 364 deletions(-) diff --git a/test/data/manifests/rhel_90-aarch64-ami-boot.json b/test/data/manifests/rhel_90-aarch64-ami-boot.json index 881d90bea..7cf8bf82e 100644 --- a/test/data/manifests/rhel_90-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_90-aarch64-ami-boot.json @@ -1055,14 +1055,14 @@ "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 1048576, + "size": 1024000, "start": 411648, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "CB07C243-BC44-4717-853E-28852021225B" }, { - "size": 19511196, - "start": 1460224, + "size": 19535772, + "start": 1435648, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1096,7 +1096,8 @@ { "type": "org.osbuild.mkfs.xfs", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" }, "devices": { "device": { @@ -1104,7 +1105,7 @@ "options": { "filename": "image.raw", "start": 411648, - "size": 1048576 + "size": 1024000 } } } @@ -1120,8 +1121,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "image.raw", - "start": 1460224, - "size": 19511196 + "start": 1435648, + "size": 19535772 } } } @@ -1151,7 +1152,7 @@ "options": { "filename": "image.raw", "start": 411648, - "size": 1048576 + "size": 1024000 } }, "efi": { @@ -1166,8 +1167,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "image.raw", - "start": 1460224, - "size": 19511196 + "start": 1435648, + "size": 19535772 } } }, @@ -9841,8 +9842,8 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 9989732352, - "start": 747634688, + "size": 10002315264, + "start": 735051776, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, @@ -9859,9 +9860,9 @@ { "bootable": false, "fstype": "xfs", - "label": null, + "label": "boot", "partuuid": "CB07C243-BC44-4717-853E-28852021225B", - "size": 536870912, + "size": 524288000, "start": 210763776, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "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 0b0f12450..d18f79b1b 100644 --- a/test/data/manifests/rhel_90-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_90-aarch64-ec2-boot.json @@ -1059,14 +1059,14 @@ "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 1048576, + "size": 1024000, "start": 411648, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "CB07C243-BC44-4717-853E-28852021225B" }, { - "size": 19511196, - "start": 1460224, + "size": 19535772, + "start": 1435648, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1100,7 +1100,8 @@ { "type": "org.osbuild.mkfs.xfs", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" }, "devices": { "device": { @@ -1108,7 +1109,7 @@ "options": { "filename": "image.raw", "start": 411648, - "size": 1048576 + "size": 1024000 } } } @@ -1124,8 +1125,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "image.raw", - "start": 1460224, - "size": 19511196 + "start": 1435648, + "size": 19535772 } } } @@ -1155,7 +1156,7 @@ "options": { "filename": "image.raw", "start": 411648, - "size": 1048576 + "size": 1024000 } }, "efi": { @@ -1170,8 +1171,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "image.raw", - "start": 1460224, - "size": 19511196 + "start": 1435648, + "size": 19535772 } } }, @@ -9881,8 +9882,8 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 9989732352, - "start": 747634688, + "size": 10002315264, + "start": 735051776, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, @@ -9899,9 +9900,9 @@ { "bootable": false, "fstype": "xfs", - "label": null, + "label": "boot", "partuuid": "CB07C243-BC44-4717-853E-28852021225B", - "size": 536870912, + "size": 524288000, "start": 210763776, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" diff --git a/test/data/manifests/rhel_90-aarch64-openstack-boot.json b/test/data/manifests/rhel_90-aarch64-openstack-boot.json index 82ab871fa..ec3fd904a 100644 --- a/test/data/manifests/rhel_90-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_90-aarch64-openstack-boot.json @@ -299,7 +299,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "ro net.ifnames=0" } }, @@ -847,7 +847,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -891,6 +893,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" }, @@ -907,7 +915,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "ro net.ifnames=0", "uefi": { "vendor": "redhat", @@ -942,14 +951,20 @@ "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0", "partitions": [ { - "size": 204800, + "size": 409600, "start": 2048, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 8181660, - "start": 206848, + "size": 1024000, + "start": 411648, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 6952860, + "start": 1435648, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -975,7 +990,7 @@ "options": { "filename": "disk.img", "start": 2048, - "size": 204800 + "size": 409600 } } } @@ -984,6 +999,23 @@ "type": "org.osbuild.mkfs.xfs", "options": { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 411648, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "label": "root" }, "devices": { @@ -991,8 +1023,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 206848, - "size": 8181660 + "start": 1435648, + "size": 6952860 } } } @@ -1017,20 +1049,28 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 411648, + "size": 1024000 + } + }, "efi": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 2048, - "size": 204800 + "size": 409600 } }, "root": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 206848, - "size": 8181660 + "start": 1435648, + "size": 6952860 } } }, @@ -1041,6 +1081,12 @@ "source": "root", "target": "/" }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, { "name": "efi", "type": "org.osbuild.fat", @@ -9062,7 +9108,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.aarch64" }, "bootloader": "unknown", @@ -9071,9 +9117,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.aarch64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0 $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.aarch64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.aarch64) 9.0 (Plow)", "version": "5.14.0-4.el9.aarch64" } @@ -9247,6 +9293,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -9776,20 +9830,30 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 4189009920, - "start": 105906176, + "size": 3559864320, + "start": 735051776, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, { "bootable": false, "fstype": "vfat", "label": null, "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", - "size": 104857600, + "size": 209715200, "start": 1048576, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "7B77-95E7" + }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 210763776, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" } ], "passwd": [ diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json index e059b7c0a..e7343e7e0 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json @@ -296,7 +296,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" } }, @@ -850,7 +850,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -913,6 +915,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" }, @@ -929,7 +937,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "uefi": { "vendor": "redhat", @@ -964,14 +973,20 @@ "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0", "partitions": [ { - "size": 204800, + "size": 409600, "start": 2048, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 20764572, - "start": 206848, + "size": 1024000, + "start": 411648, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19535772, + "start": 1435648, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -997,7 +1012,7 @@ "options": { "filename": "disk.img", "start": 2048, - "size": 204800 + "size": 409600 } } } @@ -1006,6 +1021,23 @@ "type": "org.osbuild.mkfs.xfs", "options": { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 411648, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "label": "root" }, "devices": { @@ -1013,8 +1045,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 206848, - "size": 20764572 + "start": 1435648, + "size": 19535772 } } } @@ -1039,20 +1071,28 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 411648, + "size": 1024000 + } + }, "efi": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 2048, - "size": 204800 + "size": 409600 } }, "root": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 206848, - "size": 20764572 + "start": 1435648, + "size": 19535772 } } }, @@ -1063,6 +1103,12 @@ "source": "root", "target": "/" }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, { "name": "efi", "type": "org.osbuild.fat", @@ -9150,7 +9196,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.aarch64" }, "bootloader": "unknown", @@ -9159,9 +9205,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.aarch64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.aarch64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.aarch64) 9.0 (Plow)", "version": "5.14.0-4.el9.aarch64" } @@ -9335,6 +9381,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -9876,20 +9930,30 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 10631460864, - "start": 105906176, + "size": 10002315264, + "start": 735051776, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, { "bootable": false, "fstype": "vfat", "label": null, "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", - "size": 104857600, + "size": 209715200, "start": 1048576, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "7B77-95E7" + }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 210763776, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" } ], "passwd": [ 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 80cf89e75..65498c52e 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json @@ -354,7 +354,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" } }, @@ -1137,7 +1137,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1253,6 +1255,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" }, @@ -1269,7 +1277,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", "uefi": { "vendor": "redhat", @@ -1304,14 +1313,20 @@ "uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0", "partitions": [ { - "size": 204800, + "size": 409600, "start": 2048, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 20764572, - "start": 206848, + "size": 1024000, + "start": 411648, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19535772, + "start": 1435648, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1337,7 +1352,7 @@ "options": { "filename": "disk.img", "start": 2048, - "size": 204800 + "size": 409600 } } } @@ -1346,6 +1361,23 @@ "type": "org.osbuild.mkfs.xfs", "options": { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 411648, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "label": "root" }, "devices": { @@ -1353,8 +1385,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 206848, - "size": 20764572 + "start": 1435648, + "size": 19535772 } } } @@ -1379,20 +1411,28 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 411648, + "size": 1024000 + } + }, "efi": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 2048, - "size": 204800 + "size": 409600 } }, "root": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 206848, - "size": 20764572 + "start": 1435648, + "size": 19535772 } } }, @@ -1403,6 +1443,12 @@ "source": "root", "target": "/" }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, { "name": "efi", "type": "org.osbuild.fat", @@ -11584,7 +11630,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.aarch64" }, "bootloader": "unknown", @@ -11593,9 +11639,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "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", + "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", + "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -11603,9 +11649,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.aarch64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.aarch64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.aarch64) 9.0 (Plow)", "version": "5.14.0-4.el9.aarch64" } @@ -11787,6 +11833,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -12347,20 +12401,30 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 10631460864, - "start": 105906176, + "size": 10002315264, + "start": 735051776, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, { "bootable": false, "fstype": "vfat", "label": null, "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", - "size": 104857600, + "size": 209715200, "start": 1048576, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "7B77-95E7" + }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 210763776, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" } ], "passwd": [ diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json index e55b98cbe..20b6542e7 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json @@ -301,7 +301,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" } }, @@ -907,7 +907,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -970,6 +972,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" } @@ -979,7 +987,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "legacy": "powerpc-ieee1275", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.ppc64le" @@ -1017,8 +1026,14 @@ "type": "41" }, { - "size": 20961180, - "start": 10240 + "size": 1024000, + "start": 10240, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19937180, + "start": 1034240 } ] }, @@ -1034,7 +1049,8 @@ { "type": "org.osbuild.mkfs.xfs", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" }, "devices": { "device": { @@ -1042,7 +1058,23 @@ "options": { "filename": "disk.img", "start": 10240, - "size": 20961180 + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 1034240, + "size": 19937180 } } } @@ -1067,12 +1099,20 @@ ] }, "devices": { - "root": { + "boot": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 10240, - "size": 20961180 + "size": 1024000 + } + }, + "root": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 1034240, + "size": 19937180 } } }, @@ -1082,6 +1122,12 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" } ] }, @@ -1100,7 +1146,7 @@ "type": "partition", "partlabel": "dos", "number": 1, - "path": "/boot/grub2" + "path": "/grub2" } } } @@ -9941,7 +9987,7 @@ ] }, "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.ppc64le" }, "bootloader": "unknown", @@ -9950,9 +9996,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.ppc64le.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.ppc64le", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.ppc64le.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.ppc64le", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.ppc64le) 9.0 (Plow)", "version": "5.14.0-4.el9.ppc64le" } @@ -10126,6 +10172,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -10720,12 +10774,22 @@ { "bootable": false, "fstype": "xfs", - "label": null, + "label": "boot", "partuuid": "14fc63d2-02", - "size": 10732124160, + "size": 524288000, "start": 5242880, - "type": "83", + "type": "0", "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, + { + "bootable": false, + "fstype": "xfs", + "label": null, + "partuuid": "14fc63d2-03", + "size": 10207836160, + "start": 529530880, + "type": "83", + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" } ], "passwd": [ diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json index a4b5fe2ac..36e7e88da 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json @@ -359,7 +359,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" } }, @@ -1200,7 +1200,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1316,6 +1318,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" } @@ -1325,7 +1333,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", "legacy": "powerpc-ieee1275", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.ppc64le" @@ -1363,8 +1372,14 @@ "type": "41" }, { - "size": 20961180, - "start": 10240 + "size": 1024000, + "start": 10240, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19937180, + "start": 1034240 } ] }, @@ -1380,7 +1395,8 @@ { "type": "org.osbuild.mkfs.xfs", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" }, "devices": { "device": { @@ -1388,7 +1404,23 @@ "options": { "filename": "disk.img", "start": 10240, - "size": 20961180 + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 1034240, + "size": 19937180 } } } @@ -1413,12 +1445,20 @@ ] }, "devices": { - "root": { + "boot": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 10240, - "size": 20961180 + "size": 1024000 + } + }, + "root": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 1034240, + "size": 19937180 } } }, @@ -1428,6 +1468,12 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" } ] }, @@ -1446,7 +1492,7 @@ "type": "partition", "partlabel": "dos", "number": 1, - "path": "/boot/grub2" + "path": "/grub2" } } } @@ -12435,7 +12481,7 @@ ] }, "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.ppc64le" }, "bootloader": "unknown", @@ -12444,9 +12490,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "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", + "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", + "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -12454,9 +12500,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.ppc64le.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.ppc64le", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.ppc64le.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.ppc64le", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.ppc64le) 9.0 (Plow)", "version": "5.14.0-4.el9.ppc64le" } @@ -12638,6 +12684,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -13251,12 +13305,22 @@ { "bootable": false, "fstype": "xfs", - "label": null, + "label": "boot", "partuuid": "14fc63d2-02", - "size": 10732124160, + "size": 524288000, "start": 5242880, - "type": "83", + "type": "0", "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, + { + "bootable": false, + "fstype": "xfs", + "label": null, + "partuuid": "14fc63d2-03", + "size": 10207836160, + "start": 529530880, + "type": "83", + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" } ], "passwd": [ diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json index bb7966c64..b94558ad9 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json @@ -405,7 +405,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" } }, @@ -994,7 +994,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1057,6 +1059,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" } @@ -1092,10 +1100,16 @@ "label": "dos", "uuid": "0x14fc63d2", "partitions": [ + { + "size": 1024000, + "start": 2048, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, { "bootable": true, - "size": 20969372, - "start": 2048 + "size": 19945372, + "start": 1026048 } ] }, @@ -1111,7 +1125,8 @@ { "type": "org.osbuild.mkfs.xfs", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" }, "devices": { "device": { @@ -1119,7 +1134,23 @@ "options": { "filename": "disk.img", "start": 2048, - "size": 20969372 + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 1026048, + "size": 19945372 } } } @@ -1144,6 +1175,14 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 2048, + "size": 1024000 + } + }, "disk": { "type": "org.osbuild.loopback", "options": { @@ -1154,8 +1193,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 2048, - "size": 20969372 + "start": 1026048, + "size": 19945372 } } }, @@ -1165,6 +1204,12 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" } ] }, @@ -1175,6 +1220,14 @@ "location": 2048 }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 2048, + "size": 1024000 + } + }, "disk": { "type": "org.osbuild.loopback", "options": { @@ -1185,8 +1238,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 2048, - "size": 20969372 + "start": 1026048, + "size": 19945372 } } }, @@ -1196,6 +1249,12 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" } ] } @@ -10870,10 +10929,10 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "id": "-20211126121109-5.14.0-4.el9.s390x", + "id": "-20211207101433-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", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "title": " (5.14.0-4.el9.s390x)", "version": "5.14.0-4.el9.s390x" } @@ -11047,6 +11106,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -11612,15 +11679,25 @@ "partition-table": "dos", "partition-table-id": "0x14fc63d2", "partitions": [ + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "14fc63d2-01", + "size": 524288000, + "start": 1048576, + "type": "0", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, { "bootable": true, "fstype": "xfs", "label": null, - "partuuid": "14fc63d2-01", - "size": 10736318464, - "start": 1048576, + "partuuid": "14fc63d2-02", + "size": 10212030464, + "start": 525336576, "type": "83", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" } ], "passwd": [ @@ -11722,13 +11799,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:boot_t:s0", - "expected": "system_u:object_r:boot_t:s0", - "filename": "/boot/bootmap" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" diff --git a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json index 9e5817685..b2d8c01ae 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json @@ -463,7 +463,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" } }, @@ -1271,7 +1271,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1387,6 +1389,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" } @@ -1422,10 +1430,16 @@ "label": "dos", "uuid": "0x14fc63d2", "partitions": [ + { + "size": 1024000, + "start": 2048, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, { "bootable": true, - "size": 20969372, - "start": 2048 + "size": 19945372, + "start": 1026048 } ] }, @@ -1441,7 +1455,8 @@ { "type": "org.osbuild.mkfs.xfs", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" }, "devices": { "device": { @@ -1449,7 +1464,23 @@ "options": { "filename": "disk.img", "start": 2048, - "size": 20969372 + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 1026048, + "size": 19945372 } } } @@ -1474,6 +1505,14 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 2048, + "size": 1024000 + } + }, "disk": { "type": "org.osbuild.loopback", "options": { @@ -1484,8 +1523,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 2048, - "size": 20969372 + "start": 1026048, + "size": 19945372 } } }, @@ -1495,6 +1534,12 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" } ] }, @@ -1505,6 +1550,14 @@ "location": 2048 }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 2048, + "size": 1024000 + } + }, "disk": { "type": "org.osbuild.loopback", "options": { @@ -1515,8 +1568,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 2048, - "size": 20969372 + "start": 1026048, + "size": 19945372 } } }, @@ -1526,6 +1579,12 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" } ] } @@ -13204,10 +13263,10 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "id": "-20211126121319-0-rescue-ffffffffffffffffffffffffffffffff", + "id": "-20211207101636-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", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "title": " (0-rescue-ffffffffffffffffffffffffffffffff)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -13215,10 +13274,10 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "id": "-20211126121319-5.14.0-4.el9.s390x", + "id": "-20211207101636-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", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "title": " (5.14.0-4.el9.s390x)", "version": "5.14.0-4.el9.s390x" } @@ -13400,6 +13459,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -13984,15 +14051,25 @@ "partition-table": "dos", "partition-table-id": "0x14fc63d2", "partitions": [ + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "14fc63d2-01", + "size": 524288000, + "start": 1048576, + "type": "0", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, { "bootable": true, "fstype": "xfs", "label": null, - "partuuid": "14fc63d2-01", - "size": 10736318464, - "start": 1048576, + "partuuid": "14fc63d2-02", + "size": 10212030464, + "start": 525336576, "type": "83", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" } ], "passwd": [ @@ -14096,13 +14173,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:boot_t:s0", - "expected": "system_u:object_r:boot_t:s0", - "filename": "/boot/bootmap" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" 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 d1c8cd70a..035b34ad0 100644 --- a/test/data/manifests/rhel_90-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_90-x86_64-ami-boot.json @@ -321,7 +321,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto" } }, @@ -834,7 +834,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1012,8 +1014,21 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" + }, + { + "uuid": "7B77-95E7", + "vfs_type": "vfat", + "path": "/boot/efi", + "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt", + "passno": 2 } ] } @@ -1021,7 +1036,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "legacy": "i386-pc", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" @@ -1060,8 +1076,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 20967324, + "size": 409600, "start": 4096, + "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" + }, + { + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19533724, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1077,10 +1105,9 @@ } }, { - "type": "org.osbuild.mkfs.xfs", + "type": "org.osbuild.mkfs.fat", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "label": "root" + "volid": "7B7795E7" }, "devices": { "device": { @@ -1088,7 +1115,41 @@ "options": { "filename": "image.raw", "start": 4096, - "size": 20967324 + "size": 409600 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "label": "root" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 1437696, + "size": 19533724 } } } @@ -1113,12 +1174,28 @@ ] }, "devices": { - "root": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 413696, + "size": 1024000 + } + }, + "efi": { "type": "org.osbuild.loopback", "options": { "filename": "image.raw", "start": 4096, - "size": 20967324 + "size": 409600 + } + }, + "root": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 1437696, + "size": 19533724 } } }, @@ -1128,6 +1205,18 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, + { + "name": "efi", + "type": "org.osbuild.fat", + "source": "efi", + "target": "/boot/efi" } ] }, @@ -1145,8 +1234,8 @@ "prefix": { "type": "partition", "partlabel": "gpt", - "number": 1, - "path": "/boot/grub2" + "number": 2, + "path": "/grub2" } } } @@ -8816,7 +8905,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -8825,9 +8914,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", - "linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", + "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -8835,9 +8924,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -9027,11 +9116,27 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", "0", "0" + ], + [ + "UUID=7B77-95E7", + "/boot/efi", + "vfat", + "defaults,uid=0,gid=0,umask=077,shortname=winnt", + "0", + "2" ] ], "groups": [ @@ -9521,8 +9626,28 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 10735269888, + "size": 10001266688, + "start": 736100352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + }, + { + "bootable": false, + "fstype": "vfat", + "label": null, + "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", + "size": 209715200, "start": 2097152, + "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "uuid": "7B77-95E7" + }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "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 67c4de6e5..235c727dd 100644 --- a/test/data/manifests/rhel_90-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_90-x86_64-ec2-boot.json @@ -321,7 +321,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto" } }, @@ -835,7 +835,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1016,8 +1018,21 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" + }, + { + "uuid": "7B77-95E7", + "vfs_type": "vfat", + "path": "/boot/efi", + "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt", + "passno": 2 } ] } @@ -1025,7 +1040,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "legacy": "i386-pc", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" @@ -1064,8 +1080,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 20967324, + "size": 409600, "start": 4096, + "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" + }, + { + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19533724, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1081,10 +1109,9 @@ } }, { - "type": "org.osbuild.mkfs.xfs", + "type": "org.osbuild.mkfs.fat", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "label": "root" + "volid": "7B7795E7" }, "devices": { "device": { @@ -1092,7 +1119,41 @@ "options": { "filename": "image.raw", "start": 4096, - "size": 20967324 + "size": 409600 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "label": "root" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 1437696, + "size": 19533724 } } } @@ -1117,12 +1178,28 @@ ] }, "devices": { - "root": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 413696, + "size": 1024000 + } + }, + "efi": { "type": "org.osbuild.loopback", "options": { "filename": "image.raw", "start": 4096, - "size": 20967324 + "size": 409600 + } + }, + "root": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 1437696, + "size": 19533724 } } }, @@ -1132,6 +1209,18 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, + { + "name": "efi", + "type": "org.osbuild.fat", + "source": "efi", + "target": "/boot/efi" } ] }, @@ -1149,8 +1238,8 @@ "prefix": { "type": "partition", "partlabel": "gpt", - "number": 1, - "path": "/boot/grub2" + "number": 2, + "path": "/grub2" } } } @@ -8855,7 +8944,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -8864,9 +8953,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", - "linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", + "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -8874,9 +8963,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -9066,11 +9155,27 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", "0", "0" + ], + [ + "UUID=7B77-95E7", + "/boot/efi", + "vfat", + "defaults,uid=0,gid=0,umask=077,shortname=winnt", + "0", + "2" ] ], "groups": [ @@ -9561,8 +9666,28 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 10735269888, + "size": 10001266688, + "start": 736100352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + }, + { + "bootable": false, + "fstype": "vfat", + "label": null, + "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", + "size": 209715200, "start": 2097152, + "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "uuid": "7B77-95E7" + }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "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 c9e8cd426..6dc75f80d 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 @@ -321,7 +321,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto" } }, @@ -1018,7 +1018,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1199,8 +1201,21 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" + }, + { + "uuid": "7B77-95E7", + "vfs_type": "vfat", + "path": "/boot/efi", + "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt", + "passno": 2 } ] } @@ -1208,7 +1223,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "legacy": "i386-pc", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" @@ -1247,8 +1263,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 20967324, + "size": 409600, "start": 4096, + "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" + }, + { + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19533724, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1264,10 +1292,9 @@ } }, { - "type": "org.osbuild.mkfs.xfs", + "type": "org.osbuild.mkfs.fat", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "label": "root" + "volid": "7B7795E7" }, "devices": { "device": { @@ -1275,7 +1302,41 @@ "options": { "filename": "image.raw", "start": 4096, - "size": 20967324 + "size": 409600 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "label": "root" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 1437696, + "size": 19533724 } } } @@ -1300,12 +1361,28 @@ ] }, "devices": { - "root": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 413696, + "size": 1024000 + } + }, + "efi": { "type": "org.osbuild.loopback", "options": { "filename": "image.raw", "start": 4096, - "size": 20967324 + "size": 409600 + } + }, + "root": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 1437696, + "size": 19533724 } } }, @@ -1315,6 +1392,18 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, + { + "name": "efi", + "type": "org.osbuild.fat", + "source": "efi", + "target": "/boot/efi" } ] }, @@ -1332,8 +1421,8 @@ "prefix": { "type": "partition", "partlabel": "gpt", - "number": 1, - "path": "/boot/grub2" + "number": 2, + "path": "/grub2" } } } @@ -11231,7 +11320,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -11240,9 +11329,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", - "linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", + "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -11250,9 +11339,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -11445,11 +11534,27 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", "0", "0" + ], + [ + "UUID=7B77-95E7", + "/boot/efi", + "vfat", + "defaults,uid=0,gid=0,umask=077,shortname=winnt", + "0", + "2" ] ], "groups": [ @@ -12127,8 +12232,28 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 10735269888, + "size": 10001266688, + "start": 736100352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + }, + { + "bootable": false, + "fstype": "vfat", + "label": null, + "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", + "size": 209715200, "start": 2097152, + "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "uuid": "7B77-95E7" + }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "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 ad033b723..316fee8e0 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 @@ -321,7 +321,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1" } }, @@ -1052,7 +1052,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1350,8 +1352,21 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" + }, + { + "uuid": "7B77-95E7", + "vfs_type": "vfat", + "path": "/boot/efi", + "options": "defaults,uid=0,gid=0,umask=077,shortname=winnt", + "passno": 2 } ] } @@ -1359,7 +1374,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", "legacy": "i386-pc", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" @@ -1398,8 +1414,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 20967324, + "size": 409600, "start": 4096, + "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" + }, + { + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19533724, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1415,10 +1443,9 @@ } }, { - "type": "org.osbuild.mkfs.xfs", + "type": "org.osbuild.mkfs.fat", "options": { - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "label": "root" + "volid": "7B7795E7" }, "devices": { "device": { @@ -1426,7 +1453,41 @@ "options": { "filename": "image.raw", "start": 4096, - "size": 20967324 + "size": 409600 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "label": "root" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 1437696, + "size": 19533724 } } } @@ -1451,12 +1512,28 @@ ] }, "devices": { - "root": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 413696, + "size": 1024000 + } + }, + "efi": { "type": "org.osbuild.loopback", "options": { "filename": "image.raw", "start": 4096, - "size": 20967324 + "size": 409600 + } + }, + "root": { + "type": "org.osbuild.loopback", + "options": { + "filename": "image.raw", + "start": 1437696, + "size": 19533724 } } }, @@ -1466,6 +1543,18 @@ "type": "org.osbuild.xfs", "source": "root", "target": "/" + }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, + { + "name": "efi", + "type": "org.osbuild.fat", + "source": "efi", + "target": "/boot/efi" } ] }, @@ -1483,8 +1572,8 @@ "prefix": { "type": "partition", "partlabel": "gpt", - "number": 1, - "path": "/boot/grub2" + "number": 2, + "path": "/grub2" } } } @@ -11790,7 +11879,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -11799,9 +11888,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", - "linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", + "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", + "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -11809,9 +11898,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1 $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -12006,11 +12095,27 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", "0", "0" + ], + [ + "UUID=7B77-95E7", + "/boot/efi", + "vfat", + "defaults,uid=0,gid=0,umask=077,shortname=winnt", + "0", + "2" ] ], "groups": [ @@ -12721,8 +12826,28 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 10735269888, + "size": 10001266688, + "start": 736100352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + }, + { + "bootable": false, + "fstype": "vfat", + "label": null, + "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", + "size": 209715200, "start": 2097152, + "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", + "uuid": "7B77-95E7" + }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" }, 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 66d1dbe7b..8530d4fe6 100644 --- a/test/data/manifests/rhel_90-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_90-x86_64-openstack-boot.json @@ -337,7 +337,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "ro net.ifnames=0" } }, @@ -909,7 +909,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -953,6 +955,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" }, @@ -969,7 +977,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "ro net.ifnames=0", "legacy": "i386-pc", "uefi": { @@ -1011,14 +1020,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 204800, + "size": 409600, "start": 4096, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 8179612, - "start": 208896, + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 6950812, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1044,7 +1059,7 @@ "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } } } @@ -1053,6 +1068,23 @@ "type": "org.osbuild.mkfs.xfs", "options": { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "label": "root" }, "devices": { @@ -1060,8 +1092,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 8179612 + "start": 1437696, + "size": 6950812 } } } @@ -1086,20 +1118,28 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + }, "efi": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } }, "root": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 8179612 + "start": 1437696, + "size": 6950812 } } }, @@ -1110,6 +1150,12 @@ "source": "root", "target": "/" }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, { "name": "efi", "type": "org.osbuild.fat", @@ -1133,7 +1179,7 @@ "type": "partition", "partlabel": "gpt", "number": 2, - "path": "/boot/grub2" + "path": "/grub2" } } } @@ -9525,7 +9571,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -9534,9 +9580,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0 $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -9713,6 +9759,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -10262,21 +10316,31 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 4187961344, - "start": 106954752, + "size": 3558815744, + "start": 736100352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, { "bootable": false, "fstype": "vfat", "label": null, "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", - "size": 104857600, + "size": 209715200, "start": 2097152, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "7B77-95E7" }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, { "bootable": false, "fstype": null, 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 d32bd06d5..2fe7cddde 100644 --- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json @@ -334,7 +334,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" } }, @@ -898,7 +898,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -961,6 +963,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" }, @@ -977,7 +985,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "legacy": "i386-pc", "uefi": { @@ -1019,14 +1028,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 204800, + "size": 409600, "start": 4096, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 20762524, - "start": 208896, + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19533724, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1052,7 +1067,7 @@ "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } } } @@ -1061,6 +1076,23 @@ "type": "org.osbuild.mkfs.xfs", "options": { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "label": "root" }, "devices": { @@ -1068,8 +1100,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 20762524 + "start": 1437696, + "size": 19533724 } } } @@ -1094,20 +1126,28 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + }, "efi": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } }, "root": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 20762524 + "start": 1437696, + "size": 19533724 } } }, @@ -1118,6 +1158,12 @@ "source": "root", "target": "/" }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, { "name": "efi", "type": "org.osbuild.fat", @@ -1141,7 +1187,7 @@ "type": "partition", "partlabel": "gpt", "number": 2, - "path": "/boot/grub2" + "path": "/grub2" } } } @@ -9431,7 +9477,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -9440,9 +9486,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -9619,6 +9665,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -10166,21 +10220,31 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 10630412288, - "start": 106954752, + "size": 10001266688, + "start": 736100352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, { "bootable": false, "fstype": "vfat", "label": null, "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", - "size": 104857600, + "size": 209715200, "start": 2097152, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "7B77-95E7" }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, { "bootable": false, "fstype": null, 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 cb3007669..7e75567f2 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 @@ -392,7 +392,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" } }, @@ -1202,7 +1202,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -1318,6 +1320,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" }, @@ -1334,7 +1342,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", "legacy": "i386-pc", "uefi": { @@ -1376,14 +1385,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 204800, + "size": 409600, "start": 4096, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 20762524, - "start": 208896, + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 19533724, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1409,7 +1424,7 @@ "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } } } @@ -1418,6 +1433,23 @@ "type": "org.osbuild.mkfs.xfs", "options": { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "label": "root" }, "devices": { @@ -1425,8 +1457,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 20762524 + "start": 1437696, + "size": 19533724 } } } @@ -1451,20 +1483,28 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + }, "efi": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } }, "root": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 20762524 + "start": 1437696, + "size": 19533724 } } }, @@ -1475,6 +1515,12 @@ "source": "root", "target": "/" }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, { "name": "efi", "type": "org.osbuild.fat", @@ -1498,7 +1544,7 @@ "type": "partition", "partlabel": "gpt", "number": 2, - "path": "/boot/grub2" + "path": "/grub2" } } } @@ -12071,7 +12117,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -12080,9 +12126,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "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", + "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", + "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -12090,9 +12136,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -12277,6 +12323,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -12855,21 +12909,31 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 10630412288, - "start": 106954752, + "size": 10001266688, + "start": 736100352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, { "bootable": false, "fstype": "vfat", "label": null, "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", - "size": 104857600, + "size": 209715200, "start": 2097152, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "7B77-95E7" }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, { "bootable": false, "fstype": null, 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 2cb945ee3..856897417 100644 --- a/test/data/manifests/rhel_90-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_90-x86_64-vhd-boot.json @@ -334,7 +334,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0" } }, @@ -898,7 +898,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -952,6 +954,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" }, @@ -968,7 +976,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0", "legacy": "i386-pc", "uefi": { @@ -1010,14 +1019,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 204800, + "size": 409600, "start": 4096, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 8179612, - "start": 208896, + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 6950812, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1043,7 +1058,7 @@ "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } } } @@ -1052,6 +1067,23 @@ "type": "org.osbuild.mkfs.xfs", "options": { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "label": "root" }, "devices": { @@ -1059,8 +1091,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 8179612 + "start": 1437696, + "size": 6950812 } } } @@ -1085,20 +1117,28 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + }, "efi": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } }, "root": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 8179612 + "start": 1437696, + "size": 6950812 } } }, @@ -1109,6 +1149,12 @@ "source": "root", "target": "/" }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, { "name": "efi", "type": "org.osbuild.fat", @@ -1132,7 +1178,7 @@ "type": "partition", "partlabel": "gpt", "number": 2, - "path": "/boot/grub2" + "path": "/grub2" } } } @@ -9427,7 +9473,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -9436,9 +9482,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0 $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -9623,6 +9669,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -10164,21 +10218,31 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 4187961344, - "start": 106954752, + "size": 3558815744, + "start": 736100352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, { "bootable": false, "fstype": "vfat", "label": null, "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", - "size": 104857600, + "size": 209715200, "start": 2097152, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "7B77-95E7" }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, { "bootable": false, "fstype": null, 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 9eef96912..b629c9ea9 100644 --- a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json @@ -334,7 +334,7 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "kernel_opts": "ro net.ifnames=0" } }, @@ -882,7 +882,9 @@ }, { "type": "org.osbuild.fix-bls", - "options": {} + "options": { + "prefix": "" + } }, { "type": "org.osbuild.locale", @@ -926,6 +928,12 @@ { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "vfs_type": "xfs", + "path": "/boot", + "options": "defaults" + }, + { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "vfs_type": "xfs", "path": "/", "options": "defaults" }, @@ -942,7 +950,8 @@ { "type": "org.osbuild.grub2", "options": { - "root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", "kernel_opts": "ro net.ifnames=0", "legacy": "i386-pc", "uefi": { @@ -984,14 +993,20 @@ "uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549" }, { - "size": 204800, + "size": 409600, "start": 4096, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33" }, { - "size": 8179612, - "start": 208896, + "size": 1024000, + "start": 413696, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "CB07C243-BC44-4717-853E-28852021225B" + }, + { + "size": 6950812, + "start": 1437696, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562" } @@ -1017,7 +1032,7 @@ "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } } } @@ -1026,6 +1041,23 @@ "type": "org.osbuild.mkfs.xfs", "options": { "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "label": "boot" + }, + "devices": { + "device": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + } + } + }, + { + "type": "org.osbuild.mkfs.xfs", + "options": { + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "label": "root" }, "devices": { @@ -1033,8 +1065,8 @@ "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 8179612 + "start": 1437696, + "size": 6950812 } } } @@ -1059,20 +1091,28 @@ ] }, "devices": { + "boot": { + "type": "org.osbuild.loopback", + "options": { + "filename": "disk.img", + "start": 413696, + "size": 1024000 + } + }, "efi": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", "start": 4096, - "size": 204800 + "size": 409600 } }, "root": { "type": "org.osbuild.loopback", "options": { "filename": "disk.img", - "start": 208896, - "size": 8179612 + "start": 1437696, + "size": 6950812 } } }, @@ -1083,6 +1123,12 @@ "source": "root", "target": "/" }, + { + "name": "boot", + "type": "org.osbuild.xfs", + "source": "boot", + "target": "/boot" + }, { "name": "efi", "type": "org.osbuild.fat", @@ -1106,7 +1152,7 @@ "type": "partition", "partlabel": "gpt", "number": 2, - "path": "/boot/grub2" + "path": "/grub2" } } } @@ -9209,7 +9255,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -9218,9 +9264,9 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "initrd": "/boot/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", - "linux": "/boot/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8 ro net.ifnames=0 $tuned_params", + "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", + "linux": "/vmlinuz-5.14.0-4.el9.x86_64", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -9297,6 +9343,14 @@ "fstab": [ [ "UUID=0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", + "/boot", + "xfs", + "defaults", + "0", + "0" + ], + [ + "UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "/", "xfs", "defaults", @@ -9822,21 +9876,31 @@ "fstype": "xfs", "label": "root", "partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562", - "size": 4187961344, - "start": 106954752, + "size": 3558815744, + "start": 736100352, "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", - "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" }, { "bootable": false, "fstype": "vfat", "label": null, "partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33", - "size": 104857600, + "size": 209715200, "start": 2097152, "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "uuid": "7B77-95E7" }, + { + "bootable": false, + "fstype": "xfs", + "label": "boot", + "partuuid": "CB07C243-BC44-4717-853E-28852021225B", + "size": 524288000, + "start": 211812352, + "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", + "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" + }, { "bootable": false, "fstype": null,