Skip to content

Commit

Permalink
Keep use of cos instead of kairos in bootargs.cfg
Browse files Browse the repository at this point in the history
Signed-off-by: Mauro Morales <[email protected]>
  • Loading branch information
mauromorales committed Apr 18, 2023
1 parent 3d4af2b commit 82475a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions overlay/files-opensuse-arm-rpi/etc/cos/bootargs.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ set kernel=/boot/vmlinuz
# https://en.opensuse.org/HCL:Raspberry_Pi3#DSI_output_not_supported_by_VC4_driver,
# https://bugzilla.opensuse.org/show_bug.cgi?id=1181683 and https://github.com/raspberrypi/linux/issues/4020
if [ -n "$recoverylabel" ]; then
set kernelcmd="console=tty1 console=ttyS0,115200 root=live:LABEL=$recoverylabel net.ifnames=1 rd.live.dir=/ rd.live.squashimg=$img panic=5 modprobe.blacklist=vc4 rd.kairos.oemtimeout=10"
set kernelcmd="console=tty1 console=ttyS0,115200 root=live:LABEL=$recoverylabel net.ifnames=1 rd.live.dir=/ rd.live.squashimg=$img panic=5 modprobe.blacklist=vc4 rd.cos.oemtimeout=10"
else
set kernelcmd="console=tty1 console=ttyS0,115200 root=LABEL=$label net.ifnames=1 kairos-img/filename=$img panic=5 security=selinux selinux=1 modprobe.blacklist=vc4 rd.kairos.oemtimeout=10 rd.kairos.oemlabel=kairos_OEM"
set kernelcmd="console=tty1 console=ttyS0,115200 root=LABEL=$label net.ifnames=1 cos-img/filename=$img panic=5 security=selinux selinux=1 modprobe.blacklist=vc4 rd.cos.oemtimeout=10 rd.cos.oemlabel=COS_OEM"
fi

set initramfs=/boot/initrd
4 changes: 2 additions & 2 deletions overlay/files-ubuntu-arm-rpi/etc/cos/bootargs.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ set kernel=/boot/vmlinuz
# https://en.opensuse.org/HCL:Raspberry_Pi3#DSI_output_not_supported_by_VC4_driver,
# https://bugzilla.opensuse.org/show_bug.cgi?id=1181683 and https://github.com/raspberrypi/linux/issues/4020
if [ -n "$recoverylabel" ]; then
set kernelcmd="console=tty1 console=ttyS0,115200 root=live:LABEL=$recoverylabel net.ifnames=1 rd.live.dir=/ rd.live.squashimg=$img panic=5 modprobe.blacklist=vc4 rd.kairos.oemtimeout=10"
set kernelcmd="console=tty1 console=ttyS0,115200 root=live:LABEL=$recoverylabel net.ifnames=1 rd.live.dir=/ rd.live.squashimg=$img panic=5 modprobe.blacklist=vc4 rd.cos.oemtimeout=10"
else
set kernelcmd="console=tty1 console=ttyS0,115200 root=LABEL=$label net.ifnames=1 kairos-img/filename=$img panic=5 security=selinux selinux=1 modprobe.blacklist=vc4 rd.kairos.oemtimeout=10 rd.kairos.oemlabel=kairos_OEM"
set kernelcmd="console=tty1 console=ttyS0,115200 root=LABEL=$label net.ifnames=1 cos-img/filename=$img panic=5 security=selinux selinux=1 modprobe.blacklist=vc4 rd.cos.oemtimeout=10 rd.cos.oemlabel=COS_OEM"
fi

set initramfs=/boot/initrd

0 comments on commit 82475a5

Please sign in to comment.