X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fgrub%2Fgrub.conf;h=92255ba5d2cc11fe4d52130b5ceadf4342cce56e;hp=9df4d18d0da41365fc84fc0918d24b6266088926;hb=aee3027d875826e18b3eb198f9ad0c3228bfbb01;hpb=edd536b61215b7bd9f88b0de8b10de6bc1f5ba29

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 9df4d18d0d..92255ba5d2 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -3,33 +3,33 @@ default saved
 foreground = 16064e
 background = ffffff
 gfxmenu /grub/message
-title IPFire KVERSION (1024x768)
+title IPFire (1024x768)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 splash=silent ro
+  initrd /ipfirerd.img
   savedefault 0
-title IPFire KVERSION (640x480)
+title IPFire (VESA)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-ipfire root=ROOT panic=10 ro
+  initrd /ipfirerd.img
   savedefault 1
-title IPFire KVERSION SMP (1024x768)
+title IPFire SMP (1024x768)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
+  initrd /ipfirerd-smp.img
   savedefault 2
-title IPFire KVERSION SMP (640x480)
+title IPFire SMP (VESA)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=785 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off ro
+  initrd /ipfirerd-smp.img
   savedefault 3
-title IPFire KVERSION SMP-HT (Intel Pentium 4) (1024x768)
+title IPFire SMP-HT (Intel Pentium 4) (1024x768)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
+  initrd /ipfirerd-smp.img
   savedefault 4
-title IPFire KVERSION SMP-HT (Intel Pentium 4) (640x480)
+title IPFire SMP-HT (Intel Pentium 4) (VESA)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=785 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht ro
+  initrd /ipfirerd-smp.img
   savedefault 5