generator: Cut names of files loaded by bootloader.

syslinux is apperently not able to read files with
names longer than 8 characters.

diff --git a/src/bootloader/installer.conf b/src/bootloader/installer.conf
index 902297247dfc25daec2b8b59c050467a96fcbf49..4e1ac98aeb45a6f1b3ab1dcd958a2af847b2dc20 100644 (file)
--- a/src/bootloader/installer.conf
+++ b/src/bootloader/installer.conf
@@ -22,12 +22,12 @@ MENU hiddenrow 5
 LABEL install
        MENU label ^Install a new @NAME@ system
        MENU default
-       KERNEL vmlinuz-@KERNEL@
-       APPEND initrd=initrd-@KERNEL@.img root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 mode=install quiet ro
+       KERNEL vmlinuz
+       APPEND initrd=initrd root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 mode=install quiet ro
 label rescue
        MENU label ^Rescue installed @NAME@ system
-       KERNEL vmlinuz-@KERNEL@
-       APPEND initrd=initrd-@KERNEL@.img root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 mode=rescue quiet ro
+       KERNEL vmlinuz
+       APPEND initrd=initrd root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 mode=rescue quiet ro
 label local
        MENU label Boot from ^local drive
        LOCALBOOT 0xffff

diff --git a/tools/generator b/tools/generator
index 69a10241f7d57f17a86b2f6a6a1b9f110bd59bd0..7f673ff67e4229fbef4164f1833af88286088219 100755 (executable)
--- a/tools/generator
+++ b/tools/generator
@@ -60,8 +60,8 @@ function install_kernel() {
        mkdir -p ${dest} 2>/dev/null
 
        local file
-       for file in vmlinuz-${KERNEL_RELEASE} initrd-${KERNEL_RELEASE}.img; do
-               cp -f /boot/${file} ${dest}/${file}
+       for file in vmlinuz initrd; do
+               cp -f /boot/${file}-${KERNEL_RELEASE}* ${dest}/${file}
        done
 }