🎨 Fix further inconsistencies after #177

kairos-io · Oct 20, 2022 · 995306d · 995306d
1 parent c52fe92
commit 995306d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/overlay/files-fedora/etc/cos/bootargs.cfg b/overlay/files-fedora/etc/cos/bootargs.cfg
@@ -2,10 +2,10 @@ set kernel=/boot/vmlinuz
 # temporarly disabling SELinux until we have a profile (https://github.com/kairos-io/kairos/issues/114)
 if [ -n "$recoverylabel" ]; then
     # Boot arguments when the image is used as recovery
-    set kernelcmd="console=tty1 root=live:CDLABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5 selinux=0"
+    set kernelcmd="console=tty1 console=ttyS0 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5 selinux=0 rd.cos.oemlabel=COS_OEM"
 else
     # Boot arguments when the image is used as active/passive
-    set kernelcmd="console=tty1 root=LABEL=$label net.ifnames=1 cos-img/filename=$img panic=5 rd.cos.oemlabel=COS_OEM selinux=0"
+    set kernelcmd="console=tty1 console=ttyS0 root=LABEL=$label net.ifnames=1 cos-img/filename=$img panic=5 rd.cos.oemlabel=COS_OEM selinux=0"
 fi
 
 set initramfs=/boot/initrd
diff --git a/overlay/files-ubuntu/etc/cos/bootargs.cfg b/overlay/files-ubuntu/etc/cos/bootargs.cfg
@@ -2,10 +2,10 @@ set kernel=/boot/vmlinuz
 if [ -n "$recoverylabel" ]; then
     # Removed console=ttyS0 (don't use it), and also rd.neetnet=1 which results in dupliate ips
     # Added fancy vga=795 nomodeset
-    set kernelcmd="console=tty1 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5"
+    set kernelcmd="console=tty1 console=ttyS0 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5 rd.cos.oemlabel=COS_OEM"
 else
     # set kernelcmd="console=tty1 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=1 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795 nomodeset"
-    set kernelcmd="console=tty1 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=0 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795"
+    set kernelcmd="console=tty1 console=ttyS0 root=LABEL=$label cos-img/filename=$img panic=5 security=selinux selinux=0 rd.cos.oemlabel=COS_OEM rd.neednet=0 vga=795"
 fi
 
 set initramfs=/boot/initrd
diff --git a/overlay/files/etc/cos/bootargs.cfg b/overlay/files/etc/cos/bootargs.cfg
@@ -1,10 +1,10 @@
 set kernel=/boot/vmlinuz
 if [ -n "$recoverylabel" ]; then
     # Boot arguments when the image is used as recovery
-    set kernelcmd="console=tty1 root=live:CDLABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5"
+    set kernelcmd="console=tty1 console=ttyS0 root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=5 rd.cos.oemlabel=COS_OEM"
 else
     # Boot arguments when the image is used as active/passive
-    set kernelcmd="console=tty1 root=LABEL=$label net.ifnames=1 cos-img/filename=$img panic=5 security=selinux rd.cos.oemlabel=COS_OEM selinux=1 fsck.mode=force fsck.repair=yes systemd.crash_reboot=yes"
+    set kernelcmd="console=tty1 console=ttyS0 root=LABEL=$label net.ifnames=1 cos-img/filename=$img panic=5 security=selinux rd.cos.oemlabel=COS_OEM selinux=1 fsck.mode=force fsck.repair=yes systemd.crash_reboot=yes"
 fi
 
 set initramfs=/boot/initrd