[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 874eabd6f57f8ad894b237d1a1fc029096070163

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 874eabd6f57f8ad894b237d1a1fc029096070163

[git]

[-- Attachment #1: Type: text/plain, Size: 2786 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  874eabd6f57f8ad894b237d1a1fc029096070163 (commit)
      from  1bee37ba2cd744820cc16133e4703b2df3a2892f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 874eabd6f57f8ad894b237d1a1fc029096070163
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Aug 15 20:08:22 2017 +0200

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/etc/inittab                  | 2 +-
 config/rootfiles/core/113/update.sh | 3 +++
 src/initscripts/system/firstsetup   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/etc/inittab b/config/etc/inittab
index 5f7d0a6..506fa23 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 0b993a4..9d26462 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 70c30b4..857269e 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
 			;;
 			*)


hooks/post-receive
--
IPFire 2.x development tree