Changed grub.conf and install to use KernelVersion at initrd and vmlinuz

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index f0a9d0e6113bea00d9f2afa448dbc48bab7ee01e..74918e8f49ab499c9f71ccb7e421979ad13ef3f0 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -4,33 +4,28 @@ foreground = 6d6963
 background = ffffff
 #hiddenmenu
 splashimage (hd0,0)/grub/ipfire.xpm.gz
-title IPFire (1024x768)
+title IPFire
   root (hd0,0)
-  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 MOUNT
-  initrd /ipfirerd.img
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 0
-title IPFire (VESA)
+title IPFire (vesafb 1024x768)
   root (hd0,0)
-  kernel /vmlinuz-ipfire root=ROOT panic=10 MOUNT
-  initrd /ipfirerd.img
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 1
-title IPFire SMP (1024x768)
+title IPFire (noacpi)
   root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 MOUNT
-  initrd /ipfirerd-smp.img
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 noacpi MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 2
-title IPFire SMP (VESA)
+title IPFire SMP/HT
   root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off MOUNT
-  initrd /ipfirerd-smp.img
+  kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 MOUNT
+  initrd /ipfirerd-KVER-smp.img
   savedefault 3
-title IPFire SMP-HT (Intel Pentium 4) (1024x768)
+title IPFire SMP/HT (vesafb 1024x768)
   root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 MOUNT
-  initrd /ipfirerd-smp.img
+  kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 vga=791 MOUNT
+  initrd /ipfirerd-KVER-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