[Debian-live-changes] r1706 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-24 16:12:20 +0000 (Thu, 24 May 2007)
New Revision: 1706

Modified:
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-24 16:02:43 UTC (rev 1705)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-24 16:12:20 UTC (rev 1706)
@@ -230,13 +230,20 @@
 # Assembling memtest configuration
 if [ -f "${DESTDIR_LIVE}"/memtest ]
 then
-	if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ]
 	then
-		MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
-		MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+		then
+			MEMTEST="LABEL memtest\n\tkernel /memtest"
+		else
+			MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
+		fi
 	else
 		MEMTEST="LABEL memtest\n\tkernel memtest"
 	fi
+
+	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
 fi
 
 case "${LIVE_BINARY_IMAGES}" in