Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 886d6d77b01b8d3eacd1be336a9df4a8315d3054..2199bf1d895f5244ecdd53aedbfadd2d759180bb 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -3,34 +3,19 @@ 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,115200n8" to kernel cmdline,
+# *** uncomment following lines and check also inittab
+#serial --unit=0 --speed=115200
+#terminal --timeout=1 serial console
 title IPFire
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 0
-title IPFire (vesafb 640x480)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 1
 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
-title IPFire (acpi disabled)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 3
-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
-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
+  savedefault 1