Remove emergency grub entry.

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 2b9b4b89fbd5cc5500af80f9ec6e13ae7ebe4adf..c3f2ebddf817de7f0707b493736add6d0002e564 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,21 +1,41 @@
-timeout 5
+timeout 10
 default saved
-foreground = 16064e
+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 root=ROOT panic=10 acpi=off vga=0x317 splash=silent ro
-  savedefault
-title IPFire SMP
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 0
+title IPFire (vesafb 640x480)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=0x317 splash=silent ro
-  savedefault
-title IPFire (ACPI enabled)
+  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 root=ROOT panic=10 vga=0x317 splash=silent ro
-  savedefault
-title IPFire SMP (ACPI HT enabled)
+  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-smp root=ROOT panic=10 acpi=ht vga=0x317 splash=silent ro
-  savedefault
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
+  initrd /ipfirerd-KVER.img
+  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 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 5