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

distro/fedora: extend kernel options for openstack, qcow2, vhd and vmdk types

Browse source 
* Use the same value from AMI to these image types:

"ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0"

* Regenerate manifests
This commit is contained in:
Jordi Gil 2022-05-05 08:57:02 -04:00 • committed by Tomáš Hozza
parent 69095f5034
commit b6f61d26ea
21 changed files with 66 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/distro/fedora/distro.go
View file

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

5
test/data/manifests/fedora_34-aarch64-oci-boot.json
View file

@ -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"
}

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

@ -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"
}

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

@ -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"
}

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

@ -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"
}

5
test/data/manifests/fedora_34-x86_64-oci-boot.json
View file

@ -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"
}

5
test/data/manifests/fedora_34-x86_64-openstack-boot.json
View file

@ -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"
}

5
test/data/manifests/fedora_34-x86_64-qcow2-boot.json
View file

@ -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"
}

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

@ -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"
}

4
test/data/manifests/fedora_34-x86_64-vhd-boot.json
View file

@ -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"
}

5
test/data/manifests/fedora_34-x86_64-vmdk-boot.json
View file

@ -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"
}

5
test/data/manifests/fedora_35-aarch64-oci-boot.json
View file

@ -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"
}

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

@ -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"
}

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

@ -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"
}

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

@ -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"
}

5
test/data/manifests/fedora_35-x86_64-oci-boot.json
View file

@ -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"
}

5
test/data/manifests/fedora_35-x86_64-openstack-boot.json
View file

@ -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"
}

5
test/data/manifests/fedora_35-x86_64-qcow2-boot.json
View file

@ -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"
}

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

@ -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"
}

4
test/data/manifests/fedora_35-x86_64-vhd-boot.json
View file

@ -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"
}

5
test/data/manifests/fedora_35-x86_64-vmdk-boot.json
View file

@ -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"
}