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

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

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 4cd8ffd07353d151391819e019ca29f532b076d4..878d64ee2bdbe85819d602e5f0b266f8e937f5a3 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -501,6 +501,8 @@ int main(int argc, char *argv[])
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        }
 
+       replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
+
        /* mkinitcpio has a problem if ide and pata are included */
        if ( scsi_disk==1 ) {
            /* Remove the ide hook if we install sda */
@@ -510,9 +512,9 @@ int main(int argc, char *argv[])
            replace("/harddisk/etc/mkinitcpio.conf", " pata ", " ");
        }
        /* Going to make our initrd... */
-       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION);
+       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-smp.img -k %s-ipfire-smp", KERNEL_VERSION);
+       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
 
        sprintf(string, "root=%s3", hdparams.devnode_part_run);