Geaendert:

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 10f8a8919c26e79b4965dfed2f6d65b4417728f4..9688b7cd4c83d528aefd83e5b05eaa478d7bf161 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,21 +1,35 @@
-timeout 5\r
-default saved\r
-foreground = 16064e\r
-background = ffffff\r
-splashimage (hd0,0)/grub/ipfire.xpm.gz\r
-title IPFire\r
-  root (hd0,0)\r
-  kernel /vmlinuz root=ROOT panic=10 acpi=off ro\r
-  savedefault\r
-title IPFire SMP\r
-  root (hd0,0)\r
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off ro\r
-  savedefault\r
-title IPFire (ACPI enabled)\r
-  root (hd0,0)\r
-  kernel /vmlinuz root=ROOT panic=10 ro\r
-  savedefault\r
-title IPFire SMP (ACPI HT enabled)\r
-  root (hd0,0)\r
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro\r
-  savedefault\r
+timeout 10
+default saved
+foreground = 16064e
+background = ffffff
+gfxmenu /grub/message
+title IPFire (1024x768)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
+  initrd /initrd.splash
+  savedefault 0
+title IPFire (640x480)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
+  initrd /initrd.splash
+  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 2
+title IPFire SMP (640x480)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=785 splash=silent ro
+  initrd /initrd.splash
+  savedefault 3
+title IPFire SMP (Intel Pentium 4) (1024x768)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
+  initrd /initrd.splash
+  savedefault 4
+title IPFire SMP (Intel Pentium 4) (640x480)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=785 splash=silent ro
+  initrd /initrd.splash
+  savedefault 5