Removed unsupportet rootdelay=10 switch from grub.conf.

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

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