[Debian-live-changes] r2377 - in dists/trunk/live-helper: docs helpers

[otavio at alioth.debian.org]

Author: otavio
Date: 2007-07-03 00:01:17 +0000 (Tue, 03 Jul 2007)
New Revision: 2377

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:
helpers/lh_binary_syslinux: Fix paths for kernel and initrd image loading


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-02 21:19:22 UTC (rev 2376)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-03 00:01:17 UTC (rev 2377)
@@ -1,3 +1,8 @@
+2007-07-02  Otavio Salvador  <otavio at debian.org>
+
+	* helpers/lh_binary_syslinux:
+	  - Fix paths for kernel and initrd image loading.
+
 2007-07-02  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/lh_binary_grub:

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-02 21:19:22 UTC (rev 2376)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-03 00:01:17 UTC (rev 2377)
@@ -72,16 +72,16 @@
 	APPEND="${4}"
 
 	# pxelinux and syslinux << 3.36 lacks support to file/path
-	DIRECTORY="/`basename ${DESTDIR_LIVE}`"
-	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "/binary" ]
+	DIRECTORY="`basename ${DESTDIR_LIVE}`"
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
 	then
 		KERNEL="${DIRECTORY}/${KERNEL}"
 		INITRD="${DIRECTORY}/${INITRD}"
 	fi
 
 	LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tkernel ${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${INITRD} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n"
 }
 
 Syslinux_install_entry ()
@@ -100,8 +100,8 @@
 	fi
 
 	LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${KERNEL}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${INITRD} ${APPEND} --\n"
+	LINUX_INSTALL="${LINUX_INSTALL}\tkernel /${KERNEL}\n"
+	LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=/${INITRD} ${APPEND} --\n"
 }
 
 case "${LH_INITRAMFS}" in