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

distro/rhel90: use new unified grub2 stage options

Browse source 
With the new grub2 stage options we have the following changes to the
grub2 stage:
- Set the WriteCmdLine flag to false to not write kernel command line
  options to grubenv.
- Don't set the kernel command line options in the stage options.

The kernel command line options are now only specified in the Kernel
command line stage (org.osbuild.kernel-cmdline) so we add all options
there:
- Image type options
- Blueprint options
- Partition-table-specific options

Updated manifests and image info.

Co-Authored-By: Christian Kellner <christian@kellner.me>
This commit is contained in:
Achilleas Koutsou 2022-02-22 20:54:25 +01:00 • committed by Christian Kellner
parent 83ce9aa4ef
commit 91d9417f5a
33 changed files with 122 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -982,12 +982,12 @@
"options": {
"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 iommu.strict=0",
"uefi": {
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -9475,7 +9475,6 @@
"profile-id": "sssd"
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",

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

@ -889,12 +889,12 @@
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"kernel_opts": "ro net.ifnames=0",
"uefi": {
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -9541,7 +9541,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",

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

@ -897,12 +897,12 @@
"options": {
"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",
"uefi": {
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -9608,7 +9608,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",

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

@ -345,7 +345,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
}
},
{
@ -1208,12 +1208,12 @@
"options": {
"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 debug",
"uefi": {
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -11952,7 +11952,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",
@ -11963,7 +11962,7 @@
"grub_users": "$grub_users",
"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",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": "CentOS Stream (0-rescue-ffffffffffffffffffffffffffffffff) 9",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -11973,7 +11972,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.14.0-55.el9.aarch64.img $tuned_initrd",
"linux": "/vmlinuz-5.14.0-55.el9.aarch64",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
"title": "CentOS Stream (5.14.0-55.el9.aarch64) 9",
"version": "5.14.0-55.el9.aarch64"
}

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

@ -952,9 +952,9 @@
"options": {
"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",
"legacy": "powerpc-ieee1275",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le",
"write_cmdline": false
}
},
{
@ -10440,7 +10440,6 @@
]
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
},
"bootloader": "unknown",

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

@ -356,7 +356,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
}
},
{
@ -1270,9 +1270,9 @@
"options": {
"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 debug",
"legacy": "powerpc-ieee1275",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le",
"write_cmdline": false
}
},
{
@ -12861,7 +12861,6 @@
]
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
},
"bootloader": "unknown",
@ -12872,7 +12871,7 @@
"grub_users": "$grub_users",
"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",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": "CentOS Stream (0-rescue-ffffffffffffffffffffffffffffffff) 9",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -12882,7 +12881,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.14.0-55.el9.ppc64le.img $tuned_initrd",
"linux": "/vmlinuz-5.14.0-55.el9.ppc64le",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
"title": "CentOS Stream (5.14.0-55.el9.ppc64le) 9",
"version": "5.14.0-55.el9.ppc64le"
}

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

@ -11455,7 +11455,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220219190204-5.14.0-55.el9.s390x",
"id": "-20220222233022-5.14.0-55.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",

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

@ -459,7 +459,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
}
},
{
@ -13689,10 +13689,10 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220219190404-0-rescue-ffffffffffffffffffffffffffffffff",
"id": "-20220222233227-0-rescue-ffffffffffffffffffffffffffffffff",
"initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
"linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": " (0-rescue-ffffffffffffffffffffffffffffffff)",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -13700,10 +13700,10 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220219190404-5.14.0-55.el9.s390x",
"id": "-20220222233227-5.14.0-55.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": " (5.14.0-55.el9.s390x)",
"version": "5.14.0-55.el9.s390x"
}

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

@ -981,9 +981,9 @@
"options": {
"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",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9194,7 +9194,6 @@
"profile-id": "sssd"
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -929,12 +929,13 @@
"options": {
"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": {
"vendor": "centos"
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9990,7 +9991,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -924,12 +924,13 @@
"options": {
"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",
"legacy": "i386-pc",
"uefi": {
"vendor": "centos"
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9875,7 +9876,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -366,7 +366,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
}
},
{
@ -1250,12 +1250,13 @@
"options": {
"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 debug",
"legacy": "i386-pc",
"uefi": {
"vendor": "centos"
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -12420,7 +12421,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",
@ -12431,7 +12431,7 @@
"grub_users": "$grub_users",
"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",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": "CentOS Stream (0-rescue-ffffffffffffffffffffffffffffffff) 9",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -12441,7 +12441,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.14.0-55.el9.x86_64.img $tuned_initrd",
"linux": "/vmlinuz-5.14.0-55.el9.x86_64",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
"title": "CentOS Stream (5.14.0-55.el9.x86_64) 9",
"version": "5.14.0-55.el9.x86_64"
}

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

@ -928,12 +928,13 @@
"options": {
"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": {
"vendor": "centos"
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9884,7 +9885,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"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-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -895,12 +895,13 @@
"options": {
"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": {
"vendor": "centos"
"vendor": "centos",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9570,7 +9571,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -1005,12 +1005,12 @@
"options": {
"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 iommu.strict=0",
"uefi": {
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -8966,7 +8966,6 @@
"profile-id": "sssd"
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",

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

@ -1020,12 +1020,12 @@
"options": {
"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 iommu.strict=0",
"uefi": {
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -9028,7 +9028,6 @@
"profile-id": "sssd"
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",

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

@ -899,12 +899,12 @@
"options": {
"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",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -8973,7 +8973,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",

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

@ -925,12 +925,12 @@
"options": {
"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",
"uefi": {
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -9113,7 +9113,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",

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

@ -344,7 +344,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
}
},
{
@ -1258,12 +1258,12 @@
"options": {
"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 debug",
"uefi": {
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
"write_cmdline": false
}
},
{
@ -11477,7 +11477,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
},
"bootloader": "unknown",
@ -11488,7 +11487,7 @@
"grub_users": "$grub_users",
"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",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -11498,7 +11497,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.14.0-55.el9.aarch64.img $tuned_initrd",
"linux": "/vmlinuz-5.14.0-55.el9.aarch64",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
"title": "Red Hat Enterprise Linux (5.14.0-55.el9.aarch64) 9.0 (Plow)",
"version": "5.14.0-55.el9.aarch64"
}

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

@ -982,9 +982,9 @@
"options": {
"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",
"legacy": "powerpc-ieee1275",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le",
"write_cmdline": false
}
},
{
@ -9909,7 +9909,6 @@
]
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
},
"bootloader": "unknown",

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

@ -355,7 +355,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
}
},
{
@ -1323,9 +1323,9 @@
"options": {
"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 debug",
"legacy": "powerpc-ieee1275",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le",
"write_cmdline": false
}
},
{
@ -12353,7 +12353,6 @@
]
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
},
"bootloader": "unknown",
@ -12364,7 +12363,7 @@
"grub_users": "$grub_users",
"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",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -12374,7 +12373,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.14.0-55.el9.ppc64le.img $tuned_initrd",
"linux": "/vmlinuz-5.14.0-55.el9.ppc64le",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
"title": "Red Hat Enterprise Linux (5.14.0-55.el9.ppc64le) 9.0 (Plow)",
"version": "5.14.0-55.el9.ppc64le"
}

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

@ -10825,7 +10825,7 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220219194703-5.14.0-55.el9.s390x",
"id": "-20220222232122-5.14.0-55.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",

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

@ -458,7 +458,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
}
},
{
@ -13089,10 +13089,10 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220219194907-0-rescue-ffffffffffffffffffffffffffffffff",
"id": "-20220222232346-0-rescue-ffffffffffffffffffffffffffffffff",
"initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
"linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": " (0-rescue-ffffffffffffffffffffffffffffffff)",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -13100,10 +13100,10 @@
"grub_arg": "--unrestricted",
"grub_class": "kernel",
"grub_users": "$grub_users",
"id": "-20220219194907-5.14.0-55.el9.s390x",
"id": "-20220222232346-5.14.0-55.el9.s390x",
"initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
"linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": " (5.14.0-55.el9.s390x)",
"version": "5.14.0-55.el9.s390x"
}

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

@ -999,9 +999,9 @@
"options": {
"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",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -8737,7 +8737,6 @@
"profile-id": "sssd"
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -1016,9 +1016,9 @@
"options": {
"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",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -8801,7 +8801,6 @@
"profile-id": "sssd"
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -1214,9 +1214,9 @@
"options": {
"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",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -11240,7 +11240,6 @@
"profile-id": "sssd"
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -1439,9 +1439,9 @@
"options": {
"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 processor.max_cstate=1 intel_idle.max_cstate=1",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -12521,7 +12521,6 @@
"profile-id": "sssd"
},
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -933,12 +933,13 @@
"options": {
"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": {
"vendor": "redhat"
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9408,7 +9409,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -945,12 +945,13 @@
"options": {
"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",
"legacy": "i386-pc",
"uefi": {
"vendor": "redhat"
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9366,7 +9367,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -358,7 +358,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
}
},
{
@ -1295,12 +1295,13 @@
"options": {
"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 debug",
"legacy": "i386-pc",
"uefi": {
"vendor": "redhat"
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -11936,7 +11937,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",
@ -11947,7 +11947,7 @@
"grub_users": "$grub_users",
"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",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
"title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)",
"version": "0-rescue-ffffffffffffffffffffffffffffffff"
},
@ -11957,7 +11957,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.14.0-55.el9.x86_64.img $tuned_initrd",
"linux": "/vmlinuz-5.14.0-55.el9.x86_64",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
"title": "Red Hat Enterprise Linux (5.14.0-55.el9.x86_64) 9.0 (Plow)",
"version": "5.14.0-55.el9.x86_64"
}

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

@ -932,12 +932,13 @@
"options": {
"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": {
"vendor": "redhat"
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9310,7 +9311,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"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-55.el9.x86_64"
},
"bootloader": "grub",

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

@ -905,12 +905,13 @@
"options": {
"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": {
"vendor": "redhat"
"vendor": "redhat",
"unified": true
},
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
"write_cmdline": false
}
},
{
@ -9079,7 +9080,6 @@
"image-info": {
"/etc/resolv.conf": [],
"boot-environment": {
"kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
},
"bootloader": "grub",