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 5f7d0a6c743564810169f96104cea2107c376fb7..506fa237d4f8fb99d3c6c74b2e56569f7a1a888a 100644 (file)
--- 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 0b993a4781c4fbda928dac521d2998b5f59fa308..9d26462e6d938f4701c6d6751be6d817482d27fe 100644 (file)
--- 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 70c30b4e230fb8b9fcff9e4f607394f2f948e8b1..857269ee13d9f9f809152b20698c01bfadce65c1 100644 (file)
--- 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
                        ;;
                        *)