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 8c2152caa665fcefdb5827c0560b5fd3e5fded92..886d6d77b01b8d3eacd1be336a9df4a8315d3054 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,65 +1,36 @@
-timeout 5
+timeout 10
 default saved
-foreground = 16064e
+foreground = 6d6963
 background = ffffff
+#hiddenmenu
 splashimage (hd0,0)/grub/ipfire.xpm.gz
-title IPFire (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (800x600)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=788 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (text)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (800x600)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=788 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (text)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (ACPI enabled) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (ACPI enabled) (800x600)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=788 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (ACPI enabled) (text)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (ACPI HT enabled) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (ACPI HT enabled) (800x600)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=788 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (ACPI HT enabled) (text)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro
-  initrd /initrd.splash
-  savedefault
+title IPFire
+  root (hd0,0)
+  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-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
+  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