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

distro/rhel84: update kernel options

Browse source 
The kernel options are updated to remove the read only option "ro" from
the qcow2 and amazon image types. Also, the qcow2's kernel options are
updated to only set console=ttyS0 once. It was declared twice which is
redundant so now it is set for both tty0 and ttyS0.
This commit is contained in:
Jacob Kozol 2020-12-04 18:39:49 -05:00 • committed by Ondřej Budai
parent 5348cd1a3d
commit 51c08105fe
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/rhel84/distro.go
View file

@ -816,7 +816,7 @@ func New() distro.Distro {
"timedatex",
},
defaultTarget: "multi-user.target",
kernelOptions: "ro console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
bootable: true,
defaultSize: 6 * GigaByte,
assembler: func(options distro.ImageOptions, arch distro.Arch) *osbuild.Assembler {
@ -897,7 +897,7 @@ func New() distro.Distro {
// https://errata.devel.redhat.com/advisory/47339 lands
"timedatex",
},
kernelOptions: "ro console=ttyS0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
kernelOptions: "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
bootable: true,
defaultSize: 10 * GigaByte,
assembler: func(options distro.ImageOptions, arch distro.Arch) *osbuild.Assembler {

4
test/data/manifests/rhel_84-x86_64-ami-boot.json
View file

@ -3084,7 +3084,7 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "efe8afea-c0a8-45dc-8e6e-499279f6fa5d",
"kernel_opts": "ro console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
"kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
"legacy": "i386-pc",
"uefi": {
"vendor": "redhat"
@ -8589,7 +8589,7 @@
},
"image-info": {
"boot-environment": {
"kernelopts": "root=UUID=efe8afea-c0a8-45dc-8e6e-499279f6fa5d ro console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto"
"kernelopts": "root=UUID=efe8afea-c0a8-45dc-8e6e-499279f6fa5d console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto"
},
"bootloader": "grub",
"bootmenu": [

4
test/data/manifests/rhel_84-x86_64-qcow2-boot.json
View file

@ -3452,7 +3452,7 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "efe8afea-c0a8-45dc-8e6e-499279f6fa5d",
"kernel_opts": "ro console=ttyS0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
"legacy": "i386-pc",
"uefi": {
"vendor": "redhat"
@ -9507,7 +9507,7 @@
},
"image-info": {
"boot-environment": {
"kernelopts": "root=UUID=efe8afea-c0a8-45dc-8e6e-499279f6fa5d ro console=ttyS0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto"
"kernelopts": "root=UUID=efe8afea-c0a8-45dc-8e6e-499279f6fa5d console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto"
},
"bootloader": "grub",
"bootmenu": [

4
test/data/manifests/rhel_84-x86_64-qcow2-customize.json
View file

@ -3504,7 +3504,7 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "efe8afea-c0a8-45dc-8e6e-499279f6fa5d",
"kernel_opts": "ro console=ttyS0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"legacy": "i386-pc",
"uefi": {
"vendor": "redhat"
@ -9617,7 +9617,7 @@
},
"image-info": {
"boot-environment": {
"kernelopts": "root=UUID=efe8afea-c0a8-45dc-8e6e-499279f6fa5d ro console=ttyS0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug"
"kernelopts": "root=UUID=efe8afea-c0a8-45dc-8e6e-499279f6fa5d console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug"
},
"bootloader": "grub",
"bootmenu": [