Removed the old svn commands and started with git.

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 1bd1cc0c31825e3d2ff826b302feb3ad40b03c8e..f0a9d0e6113bea00d9f2afa448dbc48bab7ee01e 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,25 +1,36 @@
-timeout 5
+timeout 10
 default saved
-foreground = 16064e
+foreground = 6d6963
 background = ffffff
+#hiddenmenu
 splashimage (hd0,0)/grub/ipfire.xpm.gz
-title IPFire
+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 SMP
+  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 MOUNT
+  initrd /ipfirerd.img
+  savedefault 0
+title IPFire (VESA)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (ACPI enabled)
+  kernel /vmlinuz-ipfire root=ROOT panic=10 MOUNT
+  initrd /ipfirerd.img
+  savedefault 1
+title IPFire SMP (1024x768)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (ACPI HT enabled)
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 MOUNT
+  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
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off MOUNT
+  initrd /ipfirerd-smp.img
+  savedefault 3
+title IPFire SMP-HT (Intel Pentium 4) (1024x768)
+  root (hd0,0)
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 MOUNT
+  initrd /ipfirerd-smp.img
+  savedefault 4
+title IPFire SMP-HT (Intel Pentium 4) (VESA)
+  root (hd0,0)
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht MOUNT
+  initrd /ipfirerd-smp.img
+  savedefault 5