diff --git a/internal/distro/fedora/distro.go b/internal/distro/fedora/distro.go index 681caff69..4e561fc65 100644 --- a/internal/distro/fedora/distro.go +++ b/internal/distro/fedora/distro.go @@ -39,6 +39,9 @@ const ( fedora34Distribution = "fedora-34" fedora35Distribution = "fedora-35" fedora36Distribution = "fedora-36" + + //Kernel options for ami, qcow2, openstack, vhd and vmdk types + defaultKernelOptions = "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" ) var ( @@ -162,6 +165,7 @@ var ( "cloud-init-local.service", }, }, + kernelOptions: defaultKernelOptions, bootable: true, defaultSize: 2 * GigaByte, pipelines: qcow2Pipelines, @@ -194,7 +198,7 @@ var ( "loadmodules.service", }, }, - kernelOptions: "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0", + kernelOptions: defaultKernelOptions, bootable: true, defaultSize: 2 * GigaByte, pipelines: vhdPipelines, @@ -224,6 +228,7 @@ var ( "cloud-init-local.service", }, }, + kernelOptions: defaultKernelOptions, bootable: true, defaultSize: 2 * GigaByte, pipelines: vmdkPipelines, @@ -253,6 +258,7 @@ var ( "cloud-init-local.service", }, }, + kernelOptions: defaultKernelOptions, bootable: true, defaultSize: 2 * GigaByte, pipelines: openstackPipelines, @@ -282,7 +288,7 @@ var ( osPkgsKey: {osPkgsKey, blueprintPkgsKey}, }, defaultImageConfig: defaultEc2ImageConfig, - kernelOptions: "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", + kernelOptions: defaultKernelOptions, bootable: true, bootType: distro.LegacyBootType, defaultSize: 6 * GigaByte, diff --git a/test/data/manifests/fedora_34-aarch64-oci-boot.json b/test/data/manifests/fedora_34-aarch64-oci-boot.json index 123637af2..50e1d3eba 100644 --- a/test/data/manifests/fedora_34-aarch64-oci-boot.json +++ b/test/data/manifests/fedora_34-aarch64-oci-boot.json @@ -1822,7 +1822,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -11577,7 +11578,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.aarch64.img", "linux": "/vmlinuz-5.15.13-100.fc34.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora (5.15.13-100.fc34.aarch64) 34 (Cloud Edition)", "version": "5.15.13-100.fc34.aarch64" } diff --git a/test/data/manifests/fedora_34-aarch64-openstack-boot.json b/test/data/manifests/fedora_34-aarch64-openstack-boot.json index fc0595e0d..a80bae499 100644 --- a/test/data/manifests/fedora_34-aarch64-openstack-boot.json +++ b/test/data/manifests/fedora_34-aarch64-openstack-boot.json @@ -1839,7 +1839,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12227,7 +12228,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.aarch64.img", "linux": "/vmlinuz-5.15.13-100.fc34.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora (5.15.13-100.fc34.aarch64) 34 (Thirty Four)", "version": "5.15.13-100.fc34.aarch64" } diff --git a/test/data/manifests/fedora_34-aarch64-qcow2-boot.json b/test/data/manifests/fedora_34-aarch64-qcow2-boot.json index 7bd629774..ec41c2604 100644 --- a/test/data/manifests/fedora_34-aarch64-qcow2-boot.json +++ b/test/data/manifests/fedora_34-aarch64-qcow2-boot.json @@ -1836,7 +1836,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -11601,7 +11602,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.aarch64.img", "linux": "/vmlinuz-5.15.13-100.fc34.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora (5.15.13-100.fc34.aarch64) 34 (Cloud Edition)", "version": "5.15.13-100.fc34.aarch64" } diff --git a/test/data/manifests/fedora_34-aarch64-qcow2_customize-boot.json b/test/data/manifests/fedora_34-aarch64-qcow2_customize-boot.json index f692083ef..fb652c728 100644 --- a/test/data/manifests/fedora_34-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_34-aarch64-qcow2_customize-boot.json @@ -1895,7 +1895,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "debug" + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug" } }, { @@ -12123,7 +12123,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 debug", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug", "title": "Fedora (0-rescue-ffffffffffffffffffffffffffffffff) 34 (Cloud Edition)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -12133,7 +12133,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.aarch64.img", "linux": "/vmlinuz-5.15.13-100.fc34.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 debug", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug", "title": "Fedora (5.15.13-100.fc34.aarch64) 34 (Cloud Edition)", "version": "5.15.13-100.fc34.aarch64" } diff --git a/test/data/manifests/fedora_34-x86_64-oci-boot.json b/test/data/manifests/fedora_34-x86_64-oci-boot.json index 292264447..53741d4d0 100644 --- a/test/data/manifests/fedora_34-x86_64-oci-boot.json +++ b/test/data/manifests/fedora_34-x86_64-oci-boot.json @@ -1846,7 +1846,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -11826,7 +11827,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.x86_64.img", "linux": "/vmlinuz-5.15.13-100.fc34.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora (5.15.13-100.fc34.x86_64) 34 (Cloud Edition)", "version": "5.15.13-100.fc34.x86_64" } diff --git a/test/data/manifests/fedora_34-x86_64-openstack-boot.json b/test/data/manifests/fedora_34-x86_64-openstack-boot.json index dec374f60..0bd2f5e02 100644 --- a/test/data/manifests/fedora_34-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_34-x86_64-openstack-boot.json @@ -1863,7 +1863,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12350,7 +12351,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.x86_64.img", "linux": "/vmlinuz-5.15.13-100.fc34.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora (5.15.13-100.fc34.x86_64) 34 (Thirty Four)", "version": "5.15.13-100.fc34.x86_64" } diff --git a/test/data/manifests/fedora_34-x86_64-qcow2-boot.json b/test/data/manifests/fedora_34-x86_64-qcow2-boot.json index 420f5849d..cea0584dc 100644 --- a/test/data/manifests/fedora_34-x86_64-qcow2-boot.json +++ b/test/data/manifests/fedora_34-x86_64-qcow2-boot.json @@ -1860,7 +1860,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -11850,7 +11851,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.x86_64.img", "linux": "/vmlinuz-5.15.13-100.fc34.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora (5.15.13-100.fc34.x86_64) 34 (Cloud Edition)", "version": "5.15.13-100.fc34.x86_64" } diff --git a/test/data/manifests/fedora_34-x86_64-qcow2_customize-boot.json b/test/data/manifests/fedora_34-x86_64-qcow2_customize-boot.json index 654ced4a0..71abfe188 100644 --- a/test/data/manifests/fedora_34-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_34-x86_64-qcow2_customize-boot.json @@ -1919,7 +1919,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "debug" + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug" } }, { @@ -12372,7 +12372,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 debug", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug", "title": "Fedora (0-rescue-ffffffffffffffffffffffffffffffff) 34 (Cloud Edition)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -12382,7 +12382,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.x86_64.img", "linux": "/vmlinuz-5.15.13-100.fc34.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 debug", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug", "title": "Fedora (5.15.13-100.fc34.x86_64) 34 (Cloud Edition)", "version": "5.15.13-100.fc34.x86_64" } diff --git a/test/data/manifests/fedora_34-x86_64-vhd-boot.json b/test/data/manifests/fedora_34-x86_64-vhd-boot.json index b70e58168..b67d0e0c8 100644 --- a/test/data/manifests/fedora_34-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_34-x86_64-vhd-boot.json @@ -1861,7 +1861,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0" + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -11387,7 +11387,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.x86_64.img", "linux": "/vmlinuz-5.15.13-100.fc34.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora (5.15.13-100.fc34.x86_64) 34 (Thirty Four)", "version": "5.15.13-100.fc34.x86_64" } diff --git a/test/data/manifests/fedora_34-x86_64-vmdk-boot.json b/test/data/manifests/fedora_34-x86_64-vmdk-boot.json index f2b09c702..50dc3b895 100644 --- a/test/data/manifests/fedora_34-x86_64-vmdk-boot.json +++ b/test/data/manifests/fedora_34-x86_64-vmdk-boot.json @@ -1860,7 +1860,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -11849,7 +11850,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-100.fc34.x86_64.img", "linux": "/vmlinuz-5.15.13-100.fc34.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora (5.15.13-100.fc34.x86_64) 34 (Cloud Edition)", "version": "5.15.13-100.fc34.x86_64" } diff --git a/test/data/manifests/fedora_35-aarch64-oci-boot.json b/test/data/manifests/fedora_35-aarch64-oci-boot.json index f1ed9e17c..5901bf1b3 100644 --- a/test/data/manifests/fedora_35-aarch64-oci-boot.json +++ b/test/data/manifests/fedora_35-aarch64-oci-boot.json @@ -1870,7 +1870,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12066,7 +12067,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.aarch64.img", "linux": "/vmlinuz-5.15.13-200.fc35.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora Linux (5.15.13-200.fc35.aarch64) 35 (Cloud Edition)", "version": "5.15.13-200.fc35.aarch64" } diff --git a/test/data/manifests/fedora_35-aarch64-openstack-boot.json b/test/data/manifests/fedora_35-aarch64-openstack-boot.json index ff608a9ce..bc5b3cd4a 100644 --- a/test/data/manifests/fedora_35-aarch64-openstack-boot.json +++ b/test/data/manifests/fedora_35-aarch64-openstack-boot.json @@ -1887,7 +1887,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12590,7 +12591,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.aarch64.img", "linux": "/vmlinuz-5.15.13-200.fc35.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora Linux (5.15.13-200.fc35.aarch64) 35 (Thirty Five)", "version": "5.15.13-200.fc35.aarch64" } diff --git a/test/data/manifests/fedora_35-aarch64-qcow2-boot.json b/test/data/manifests/fedora_35-aarch64-qcow2-boot.json index 35b9f9340..880768a31 100644 --- a/test/data/manifests/fedora_35-aarch64-qcow2-boot.json +++ b/test/data/manifests/fedora_35-aarch64-qcow2-boot.json @@ -1884,7 +1884,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12090,7 +12091,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.aarch64.img", "linux": "/vmlinuz-5.15.13-200.fc35.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora Linux (5.15.13-200.fc35.aarch64) 35 (Cloud Edition)", "version": "5.15.13-200.fc35.aarch64" } diff --git a/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json b/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json index aad6aaefb..19468fb30 100644 --- a/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json @@ -1943,7 +1943,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "debug" + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug" } }, { @@ -12570,7 +12570,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 debug", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug", "title": "Fedora Linux (0-rescue-ffffffffffffffffffffffffffffffff) 35 (Cloud Edition)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -12580,7 +12580,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.aarch64.img", "linux": "/vmlinuz-5.15.13-200.fc35.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 debug", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug", "title": "Fedora Linux (5.15.13-200.fc35.aarch64) 35 (Cloud Edition)", "version": "5.15.13-200.fc35.aarch64" } diff --git a/test/data/manifests/fedora_35-x86_64-oci-boot.json b/test/data/manifests/fedora_35-x86_64-oci-boot.json index 97a17ca3d..5246640f1 100644 --- a/test/data/manifests/fedora_35-x86_64-oci-boot.json +++ b/test/data/manifests/fedora_35-x86_64-oci-boot.json @@ -1894,7 +1894,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12378,7 +12379,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.x86_64.img", "linux": "/vmlinuz-5.15.13-200.fc35.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora Linux (5.15.13-200.fc35.x86_64) 35 (Cloud Edition)", "version": "5.15.13-200.fc35.x86_64" } diff --git a/test/data/manifests/fedora_35-x86_64-openstack-boot.json b/test/data/manifests/fedora_35-x86_64-openstack-boot.json index 70bac33d8..d650e5e7a 100644 --- a/test/data/manifests/fedora_35-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_35-x86_64-openstack-boot.json @@ -1911,7 +1911,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12713,7 +12714,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.x86_64.img", "linux": "/vmlinuz-5.15.13-200.fc35.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora Linux (5.15.13-200.fc35.x86_64) 35 (Thirty Five)", "version": "5.15.13-200.fc35.x86_64" } diff --git a/test/data/manifests/fedora_35-x86_64-qcow2-boot.json b/test/data/manifests/fedora_35-x86_64-qcow2-boot.json index e089562eb..4b806c48a 100644 --- a/test/data/manifests/fedora_35-x86_64-qcow2-boot.json +++ b/test/data/manifests/fedora_35-x86_64-qcow2-boot.json @@ -1908,7 +1908,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12402,7 +12403,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.x86_64.img", "linux": "/vmlinuz-5.15.13-200.fc35.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora Linux (5.15.13-200.fc35.x86_64) 35 (Cloud Edition)", "version": "5.15.13-200.fc35.x86_64" } diff --git a/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json b/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json index a05babb1e..bc6b994e9 100644 --- a/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json @@ -1967,7 +1967,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "debug" + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug" } }, { @@ -12882,7 +12882,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 debug", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug", "title": "Fedora Linux (0-rescue-ffffffffffffffffffffffffffffffff) 35 (Cloud Edition)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -12892,7 +12892,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.x86_64.img", "linux": "/vmlinuz-5.15.13-200.fc35.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 debug", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0 debug", "title": "Fedora Linux (5.15.13-200.fc35.x86_64) 35 (Cloud Edition)", "version": "5.15.13-200.fc35.x86_64" } diff --git a/test/data/manifests/fedora_35-x86_64-vhd-boot.json b/test/data/manifests/fedora_35-x86_64-vhd-boot.json index ae072d571..50acb0f18 100644 --- a/test/data/manifests/fedora_35-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_35-x86_64-vhd-boot.json @@ -1909,7 +1909,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0" + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -11708,7 +11708,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.x86_64.img", "linux": "/vmlinuz-5.15.13-200.fc35.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora Linux (5.15.13-200.fc35.x86_64) 35 (Thirty Five)", "version": "5.15.13-200.fc35.x86_64" } diff --git a/test/data/manifests/fedora_35-x86_64-vmdk-boot.json b/test/data/manifests/fedora_35-x86_64-vmdk-boot.json index 798c682e6..3099a2796 100644 --- a/test/data/manifests/fedora_35-x86_64-vmdk-boot.json +++ b/test/data/manifests/fedora_35-x86_64-vmdk-boot.json @@ -1908,7 +1908,8 @@ { "type": "org.osbuild.kernel-cmdline", "options": { - "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75" + "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" } }, { @@ -12401,7 +12402,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.15.13-200.fc35.x86_64.img", "linux": "/vmlinuz-5.15.13-200.fc35.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0", "title": "Fedora Linux (5.15.13-200.fc35.x86_64) 35 (Cloud Edition)", "version": "5.15.13-200.fc35.x86_64" }