2 Buildfixes

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

diff --git a/config/grub/scsigrub.conf b/config/grub/scsigrub.conf
index e0c601efac5897c95936bd4a0d086fa7bc929531..2eade227f3c26a6f159855f7a1113914a377783d 100644 (file)
--- a/config/grub/scsigrub.conf
+++ b/config/grub/scsigrub.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 init=/linuxrc acpi=off vga=791 splash=silent rw
+  kernel /vmlinuz-ipfire root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
   initrd /ipfirerd.img
-  savedefault
-title IPFire (800x600)
+  savedefault 0
+title IPFire (VESA)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=788 splash=silent rw
+  kernel /vmlinuz-ipfire root=ROOT panic=10 init=/linuxrc rw
   initrd /ipfirerd.img
-  savedefault
-title IPFire (text)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off rw
-  initrd /ipfirerd.img
-  savedefault
+  savedefault 1
 title IPFire SMP (1024x768)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
-  initrd /ipfirerd-smp.img
-  savedefault
-title IPFire SMP (800x600)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=788 splash=silent rw
-  initrd /ipfirerd-smp.img
-  savedefault
-title IPFire SMP (text)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off rw
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
   initrd /ipfirerd-smp.img
-  savedefault
-title IPFire (ACPI enabled) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
-  initrd /ipfirerd.img
-  savedefault
-title IPFire (ACPI enabled) (800x600)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=788 splash=silent rw
-  initrd /ipfirerd.img
-  savedefault
-title IPFire (ACPI enabled) (text)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc rw
-  initrd /ipfirerd.img
-  savedefault
-title IPFire SMP (ACPI HT enabled) (1024x768)
+  savedefault 2
+title IPFire SMP (VESA)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=791 splash=silent rw
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 init=/linuxrc acpi=off rw
   initrd /ipfirerd-smp.img
-  savedefault
-title IPFire SMP (ACPI HT enabled) (800x600)
+  savedefault 3
+title IPFire SMP (Intel Pentium 4) (1024x768)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=788 splash=silent rw
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=791 splash=silent rw
   initrd /ipfirerd-smp.img
-  savedefault
-title IPFire SMP (ACPI HT enabled) (text)
+  savedefault 4
+title IPFire SMP (Intel Pentium 4) (VESA)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht rw
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 init=/linuxrc acpi=ht rw
   initrd /ipfirerd-smp.img
-  savedefault
+  savedefault 5