distro/rhel90: use new unified grub2 stage options

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

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