From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 17 Sep 2010 21:25:18 +0000 (+0200)
Subject: generator: Cut names of files loaded by bootloader.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00d2ca57c7c07ee06ec99b4fbfec3d8b4fc093c3;p=ipfire-3.x.git

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 902297247..4e1ac98ae 100644
--- 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 69a10241f..7f673ff67 100755
--- 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
 }