From 06f626f9f51219670741f6138785076b3dd124fc Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 3 Dec 2010 19:58:41 +0100
Subject: [PATCH] Some fixes for serial-console.

---
 src/install+setup/install/main.c |  2 +-
 src/paks/linux-pae/install.sh    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index cb697a152..5b408a728 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -523,7 +523,7 @@ int main(int argc, char *argv[])
 		replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage");
 		replace("/harddisk/boot/grub/grub.conf", "#serial", "serial");
 		replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal");
-		replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400 panic=10 ");
+		replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 ");
 
 		/*inittab*/
 		replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 5ca9693fd..e9417ae3d 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -43,6 +43,14 @@ ENTRY=`grep "savedefault" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $ENTRY > /dev/null
 let ENTRY=$_+1
+
+#Check if the system use serial console...
+if [ "$(grep "^serial" /boot/grub/grub.conf)" == "" ]; then
+	console=""
+else
+	console=" console=ttyS0,38400n8"
+fi
+
 #
 # backup grub.conf
 #
@@ -52,7 +60,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf
 #
 echo "" >> /boot/grub/grub.conf
 echo "title IPFire (PAE-Kernel)" >> /boot/grub/grub.conf
-echo "  kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT panic=10 $MOUNT" >> /boot/grub/grub.conf
+echo "  kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT panic=10$console $MOUNT" >> /boot/grub/grub.conf
 echo "  initrd /ipfirerd-$KVER-pae.img" >> /boot/grub/grub.conf
 echo "  savedefault $ENTRY" >> /boot/grub/grub.conf
 #
-- 
2.39.2