Noch ein paar kleine Aenderungen wegen dem mkinitcpio...

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 8c2152caa665fcefdb5827c0560b5fd3e5fded92..92255ba5d2cc11fe4d52130b5ceadf4342cce56e 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,65 +1,35 @@
-timeout 5
+timeout 10
 default saved
 foreground = 16064e
 background = ffffff
-splashimage (hd0,0)/grub/ipfire.xpm.gz
+gfxmenu /grub/message
 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)
+  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 splash=silent ro
+  initrd /ipfirerd.img
+  savedefault 0
+title IPFire (VESA)
   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
+  kernel /vmlinuz-ipfire root=ROOT panic=10 ro
+  initrd /ipfirerd.img
+  savedefault 1
 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)
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
+  initrd /ipfirerd-smp.img
+  savedefault 2
+title IPFire SMP (VESA)
   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)
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off ro
+  initrd /ipfirerd-smp.img
+  savedefault 3
+title IPFire SMP-HT (Intel Pentium 4) (1024x768)
   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)
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
+  initrd /ipfirerd-smp.img
+  savedefault 4
+title IPFire SMP-HT (Intel Pentium 4) (VESA)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro
-  initrd /initrd.splash
-  savedefault
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht ro
+  initrd /ipfirerd-smp.img
+  savedefault 5