From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 15 Aug 2017 18:08:22 +0000 (+0200)
Subject: serial-console: remove baudrate from inittab
X-Git-Tag: v2.19-core114~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=874eabd6f57f8ad894b237d1a1fc029096070163;p=people%2Fstevee%2Fipfire-2.x.git

serial-console: remove baudrate from inittab

new versions of agetty missinterpretes the baudrate and set it as TERM
without the parameter agetty use the previous rate that was set by the
kernel via console=XXX,Baudrate parameter.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/etc/inittab b/config/etc/inittab
index 5f7d0a6c74..506fa237d4 100644
--- a/config/etc/inittab
+++ b/config/etc/inittab
@@ -26,6 +26,6 @@ su:S016:once:/sbin/sulogin
 5:2345:respawn:/sbin/agetty tty5 9600
 6:2345:respawn:/sbin/agetty tty6 9600
 # *** Uncomment for serial console
-#7:2345:respawn:/sbin/agetty ttyS0 115200
+#7:2345:respawn:/sbin/agetty ttyS0
 
 # End /etc/inittab
diff --git a/config/rootfiles/core/113/update.sh b/config/rootfiles/core/113/update.sh
index 0b993a4781..9d26462e6d 100644
--- a/config/rootfiles/core/113/update.sh
+++ b/config/rootfiles/core/113/update.sh
@@ -41,6 +41,9 @@ extract_files
 # update linker config
 ldconfig
 
+# Remove baudrate from inittab
+sed -i -e "s| 115200[Nn]8||g" /etc/inittab
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
diff --git a/src/initscripts/system/firstsetup b/src/initscripts/system/firstsetup
index 70c30b4e23..857269ee13 100644
--- a/src/initscripts/system/firstsetup
+++ b/src/initscripts/system/firstsetup
@@ -12,7 +12,7 @@ ser_console() {
 		case $1 in
 			console=*)
 				scon=${1##console=};
-				sed -i -e "s|^7:2345:respawn:/sbin/agetty.*|7:2345:respawn:/sbin/agetty ${scon%%,*} ${scon##*,}|g" /etc/inittab
+				sed -i -e "s|^7:2345:respawn:/sbin/agetty.*|7:2345:respawn:/sbin/agetty ${scon%%,*}|g" /etc/inittab
 				shift
 			;;
 			*)