Just added a line for vesa vga resolution iam so lazy :D

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 911fce5e95b9129a0f79d3e03db9fd826334f2cc..886d6d77b01b8d3eacd1be336a9df4a8315d3054 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -6,41 +6,31 @@ background = ffffff
 splashimage (hd0,0)/grub/ipfire.xpm.gz
 title IPFire
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 0
-title IPFire (vesafb 1024x768)
+title IPFire (vesafb 640x480)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 1
-title IPFire (acpi=off)
+title IPFire (vesafb 1024x768)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 acpi=off MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 2
-title IPFire (vesafb 1024x768, acpi=off)
+title IPFire (acpi disabled)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 acpi=off MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 3
-title IPFire SMP/HT
+title IPFire (single Processor)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 MOUNT
-  initrd /ipfirerd-KVER-smp.img
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 4
-title IPFire SMP/HT (vesafb 1024x768)
+title IPFire (all storage drivers)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 vga=791 MOUNT
-  initrd /ipfirerd-KVER-smp.img
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
+  initrd /ipfirerd-KVER-emergency.img
   savedefault 5
-title IPFire SMP/HT (acpi=off)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 acpi=off MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 6
-title IPFire SMP/HT (vesafb 1024x768, acpi=off)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 vga=791 acpi=off MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 7