[SCM] live-helper branch, master, updated. 1.0.5-2-52-g22fdc6b

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 22fdc6b92cc8843eda47afb470557a175a590b05
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 1 13:35:56 2009 +0100

    Fixing regression imported by fixing #533846 incorrectly.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 6a064ad..d43ce12 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -193,9 +193,12 @@ Copy_syslinux_templates ()
 				;;
 
 			*)
-				LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
-
-				MENUMODULE=$(grep 'menu.c32' ${LH_SYSLINUX_CFG} | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+				if [ -z "${LH_SYSLINUX_CFG}" ]
+				then
+					MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+				else
+					LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
+				fi
 				;;
 		esac
 

-- 
live-helper