From 3d3649014465603f700cfe4191edcc39ddb64514 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 8 Sep 2023 17:11:24 +0100 Subject: [PATCH] fedora: fix default kernel command line Fix the default Fedora kernel command line. It was advertised as the default but the reality is the options were for cloud, so set a real default as the option and update the cloud options to something special for them. It's not truly correct as at least one of the options is x86 specific but when booted on other architectures those kernels will ignore it (and I honestly think it's ancient cargo culted kernel command line options). Signed-off-by: Peter Robinson --- pkg/distro/fedora/distro.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/distro/fedora/distro.go b/pkg/distro/fedora/distro.go index c0758afe21..d138879a55 100644 --- a/pkg/distro/fedora/distro.go +++ b/pkg/distro/fedora/distro.go @@ -31,8 +31,11 @@ const ( // blueprint package set name blueprintPkgsKey = "blueprint" - //Kernel options for ami, qcow2, openstack, vhd and vmdk types - defaultKernelOptions = "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" + //Default kernel command line + defaultKernelOptions = "ro" + + // Added kernel command line options for ami, qcow2, openstack, vhd and vmdk types + cloudKernelOptions = "ro no_timer_check console=ttyS0,115200n8 biosdevname=0 net.ifnames=0" ) var ( @@ -237,7 +240,7 @@ var ( "cloud-init-local.service", }, }, - kernelOptions: defaultKernelOptions, + kernelOptions: cloudKernelOptions, bootable: true, defaultSize: 5 * common.GibiByte, image: diskImage, @@ -265,7 +268,7 @@ var ( osPkgsKey: vmdkCommonPackageSet, }, defaultImageConfig: vmdkDefaultImageConfig, - kernelOptions: defaultKernelOptions, + kernelOptions: cloudKernelOptions, bootable: true, defaultSize: 2 * common.GibiByte, image: diskImage, @@ -283,7 +286,7 @@ var ( osPkgsKey: vmdkCommonPackageSet, }, defaultImageConfig: vmdkDefaultImageConfig, - kernelOptions: defaultKernelOptions, + kernelOptions: cloudKernelOptions, bootable: true, defaultSize: 2 * common.GibiByte, image: diskImage,