From 6f345c1fb43809c0fbffdbbab7a5918406b7cc77 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 17 Feb 2023 10:03:36 +0100
Subject: [PATCH] Use serial console with 115200n8 by default

A baud rate of 9600 should no longer be a common default nowadays,
so let's set it to 115200 by default instead.

Thanks: anarcat
Closes: https://github.com/grml/grml-live/issues/130
---
 templates/boot/grub/%SHORT_NAME%_options.cfg | 2 +-
 templates/boot/isolinux/grml.cfg             | 2 +-
 templates/boot/isolinux/hidden.cfg           | 2 +-
 templates/boot/isolinux/isolinux.cfg         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/boot/grub/%SHORT_NAME%_options.cfg b/templates/boot/grub/%SHORT_NAME%_options.cfg
index 001fae9..ac0e42c 100644
--- a/templates/boot/grub/%SHORT_NAME%_options.cfg
+++ b/templates/boot/grub/%SHORT_NAME%_options.cfg
@@ -74,7 +74,7 @@ menuentry "%GRML_NAME% - debug mode" {
 menuentry "%GRML_NAME% - serial mode" {
     set gfxpayload=text
     echo 'Loading kernel...'
-    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    linux /boot/%SHORT_NAME%/vmlinuz apm=power-off boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 "${loopback}" ${kernelopts} video=vesafb:off console=tty1 console=ttyS0,115200n8 
     echo 'Loading initrd...'
     initrd /boot/%SHORT_NAME%/initrd.img
 }
diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index 17560a2..64043ca 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -119,7 +119,7 @@ label persistence
 label serial
   menu label %GRML_NAME% - Serial ^Console
   kernel /boot/%SHORT_NAME%/vmlinuz
-  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off nomce net.ifnames=0 console=tty1 console=ttyS0,9600n8 
+  append initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% apm=power-off vga=normal video=vesafb:off nomce net.ifnames=0 console=tty1 console=ttyS0,115200n8 
 
 
   text help
diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index a7f0738..e23ed09 100644
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -56,7 +56,7 @@ append apm=power-off vga=788 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live
 label serial
 menu hide
 kernel /boot/%SHORT_NAME%/vmlinuz
-append apm=power-off vga=normal video=vesafb:off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 console=tty1 console=ttyS0,9600n8 
+append apm=power-off vga=normal video=vesafb:off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 console=tty1 console=ttyS0,115200n8 
 
 label userdef
 menu hide
diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index 51c8e43..fb64279 100644
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -74,7 +74,7 @@ timeout 300
 # ontimeout chain.c32 hd0 0
 
 # use this to control the bootup via a serial port:
-# serial 0 9600
+# serial 0 115200
 
 # following is a placeholder just in case you want to patch your own startup
 # options right into the Grml ISO. Feel free to use a hex editor like dhex to
-- 
2.1.4