Added serial console.

diff --git a/config/bootloader/grub.conf b/config/bootloader/grub.conf
index c940e57668d9addb67463e988f96e7de3a53bb8f..df7481f8862af4b87b0b95619e1e0b0b6395baad 100644 (file)
--- a/config/bootloader/grub.conf
+++ b/config/bootloader/grub.conf
@@ -1,36 +1,37 @@
 timeout 10
 default saved
+#serial --unit=0 --speed=9600
 foreground = 6d6963
 background = ffffff
 #hiddenmenu
 splashimage (hd0,0)/grub/splash.xpm.gz
 title IPFire (1024x768)
   root (hd0,0)
-  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 MOUNT
+  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 @SERIAL@ MOUNT
   initrd /ipfirerd.img
   savedefault 0
 title IPFire (VESA)
   root (hd0,0)
-  kernel /vmlinuz-ipfire root=ROOT panic=10 MOUNT
+  kernel /vmlinuz-ipfire root=ROOT panic=10 @SERIAL@ MOUNT
   initrd /ipfirerd.img
   savedefault 1
 title IPFire SMP (1024x768)
   root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 MOUNT
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 @SERIAL@ MOUNT
   initrd /ipfirerd-smp.img
   savedefault 2
 title IPFire SMP (VESA)
   root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off MOUNT
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off @SERIAL@ MOUNT
   initrd /ipfirerd-smp.img
   savedefault 3
 title IPFire SMP-HT (Intel Pentium 4) (1024x768)
   root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 MOUNT
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 @SERIAL@ MOUNT
   initrd /ipfirerd-smp.img
   savedefault 4
 title IPFire SMP-HT (Intel Pentium 4) (VESA)
   root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht MOUNT
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht @SERIAL@ MOUNT
   initrd /ipfirerd-smp.img
   savedefault 5

diff --git a/config/etc/inittab b/config/etc/inittab
index 52b3b66f42a57bcbbbfb1274f469f189fbba55b3..f9b20a4d1b5f54dae7cd3320fca2de125e9321fa 100644 (file)
--- a/config/etc/inittab
+++ b/config/etc/inittab
@@ -25,5 +25,6 @@ su:S016:once:/sbin/sulogin
 4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
 5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
+#7:2345:respawn:/sbin/agetty -I '\033(K' ttyS0 9600 vt100
 
 # End /etc/inittab

diff --git a/lfs/grub b/lfs/grub
index 9b9b70a3c92f20bb161b50aaa4f7d3e5f85701fc..39feacdd85badf250d352319d9d2e0eb6a0626f0 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -93,5 +93,16 @@ $(TARGET) :
            [ -f $$i ] && cp -vf $$i /boot/grub; \
        done
 
+ifeq "$(EMBEDDED)" "1"
+       # Enable serial console on embedded build
+       sed -e "s/^#serial/serial/" \
+           -e "s/@SERIAL@/console=ttyS0,9600n8/g" \
+           -i /boot/grub/grub.conf
+else
+       # Remove the placeholder @SERIAL@ on non-embedded build
+       sed -e "s/@SERIAL@//g" \
+           -i /boot/grub/grub.conf
+endif
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/stage2 b/lfs/stage2
index 1b3b736da5d1d0a8e911d83bbbdc7064d6d1f2ac..2127501318ad1a62c0c89f38991d762aa25a8663 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -95,6 +95,11 @@ $(TARGET) :
        for i in $(DIR_SRC)/config/etc/*; do \
                [ -f $$i ] && cp $$i /etc; \
        done
+
+ifeq "$(EMBEDDED)" "1"
+       # Enable serial on console 7
+       sed -e "s/^#7/7/" -i /etc/inittab
+endif
        
        ln -sf /proc/mounts /etc/mtab