Changes for serial console support

[people/pmueller/ipfire-2.x.git] / config / grub / grub.conf

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index c4b7e2adbe4b77e6d4d597a7982421feed8b19bc..b4e279669b03ec3d48b79341ceeaa1faaf5ef0e5 100644 (file)
--- 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
@@ -14,28 +19,28 @@ title IPFire (vesafb 640x480)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 1
+title IPFire (vesafb 800x600)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=788 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 2
 title IPFire (vesafb 1024x768)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 2
+  savedefault 3
 title IPFire (acpi disabled)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 3
+  savedefault 4
 title IPFire (single Processor)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 4
+  savedefault 5
 title IPFire (all storage drivers)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
   initrd /ipfirerd-KVER-emergency.img
-  savedefault 5
-title IPFire - experimental kernel-2.6.25.17 - no ipsec (vesafb 640x480)
-  root (hd0,0)
-  kernel /vmlinuz-2.6.25.17-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
-  initrd /ipfirerd-2.6.25.17.img
   savedefault 6