From 2f3973e49571cb4d159cf83d5455e7dd64acac43 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 10 May 2009 14:57:59 +0200
Subject: [PATCH] Changes for serial console support

---
 config/etc/inittab                       | 2 ++
 config/grub/grub.conf                    | 5 +++++
 config/rootfiles/core/28/filelists/files | 2 ++
 src/initscripts/init.d/beep              | 2 +-
 src/initscripts/init.d/console           | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/config/etc/inittab b/config/etc/inittab
index 7697daa61a..527a3f4de7 100644
--- a/config/etc/inittab
+++ b/config/etc/inittab
@@ -25,5 +25,7 @@ su:S016:once:/sbin/sulogin
 4:2345:respawn:/sbin/agetty tty4 9600
 5:2345:respawn:/sbin/agetty tty5 9600
 6:2345:respawn:/sbin/agetty tty6 9600
+# *** Uncomment for serial console
+#7:2345:respawn:/sbin/agetty ttyS0 38400
 
 # End /etc/inittab
diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index ccb4a09ec5..b4e279669b 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -3,7 +3,12 @@ default saved
 foreground = 6d6963
 background = ffffff
 #hiddenmenu
+# *** If you want use serial console comment next line
 splashimage (hd0,0)/grub/ipfire.xpm.gz
+# *** add "console=ttyS0,38400n8" to kernel cmdline,
+# *** uncomment following lines and check also inittab
+#serial --unit=0 --speed=38400
+#terminal --timeout=1 serial console
 title IPFire
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files
index 9b8ea8f27c..c62f6e230d 100644
--- a/config/rootfiles/core/28/filelists/files
+++ b/config/rootfiles/core/28/filelists/files
@@ -1,5 +1,7 @@
 bin/probenic.sh
 etc/ntp
+etc/rc.d/init.d/beep
+etc/rc.d/init.d/console
 etc/rc.d/init.d/snort
 etc/rc.d/init.d/networking/red
 etc/ssh/moduli
diff --git a/src/initscripts/init.d/beep b/src/initscripts/init.d/beep
index de6666edf4..6498e293ad 100644
--- a/src/initscripts/init.d/beep
+++ b/src/initscripts/init.d/beep
@@ -19,7 +19,7 @@ LENGTH=40
 
 play () {
 
-	beep -l $LENGTH -f $1
+	beep -l $LENGTH -f $1 2> /dev/null
 
 }
 
diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/console
index cb61a405ff..8d2e49dfbe 100644
--- a/src/initscripts/init.d/console
+++ b/src/initscripts/init.d/console
@@ -71,7 +71,7 @@ case "${1}" in
 			grep -o '\btty[[:digit:]]*\b'`
 		do
 			openvt -f -w -c ${TTY#tty} -- \
-				/bin/sh -c "${MODE_COMMAND}"
+				/bin/sh -c "${MODE_COMMAND}" 2>/dev/null
 		done
 
 		# Set the font (if not already set above) and the keymap
-- 
2.39.5