Noch ein paar kleine Aenderungen wegen dem mkinitcpio...

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 6fb997fc5b75aef3c5940fe0f04a92fb1bee36c5..92255ba5d2cc11fe4d52130b5ceadf4342cce56e 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -5,31 +5,31 @@ 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
+  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 splash=silent ro
+  initrd /ipfirerd.img
   savedefault 0
-title IPFire (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 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 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 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 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