X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fgrub%2Fgrub.conf;h=886d6d77b01b8d3eacd1be336a9df4a8315d3054;hp=6fb997fc5b75aef3c5940fe0f04a92fb1bee36c5;hb=324b33431a831f08770a992eb1baa552cbf8bc31;hpb=fd0763dce57c0a3ee459ea4f2e17d3591bdc7445

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 6fb997fc5b..886d6d77b0 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,35 +1,36 @@
 timeout 10
 default saved
-foreground = 16064e
+foreground = 6d6963
 background = ffffff
-gfxmenu /grub/message
-title IPFire (1024x768)
+#hiddenmenu
+splashimage (hd0,0)/grub/ipfire.xpm.gz
+title IPFire
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 0
-title IPFire (640x480)
+title IPFire (vesafb 640x480)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 1
-title IPFire SMP (1024x768)
+title IPFire (vesafb 1024x768)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 2
-title IPFire SMP (640x480)
+title IPFire (acpi disabled)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=785 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 3
-title IPFire SMP-HT (Intel Pentium 4) (1024x768)
+title IPFire (single Processor)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 4
-title IPFire SMP-HT (Intel Pentium 4) (640x480)
+title IPFire (all storage drivers)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=785 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
+  initrd /ipfirerd-KVER-emergency.img
   savedefault 5