[SCM] live-helper branch, master, updated. 1.0.5-2-54-gd148b22

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d148b2209257982f5dd6e594a9b627d64b4b7e37
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 1 16:47:15 2009 +0100

    Correctly replacing pathes in exithelp.cfg for returning back to syslinux menu.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 29bd339..3f757e6 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -315,10 +315,21 @@ Configure_syslinux_templates ()
 		$template_file
 	done
 
-	if [ -f "${SYSLINUX_PATH}/exithelp.cfg" ]
-	then
-		sed -i -e 's/isolinux.cfg/syslinux.cfg/' ${SYSLINUX_PATH}/exithelp.cfg
-	fi
+	case "${LH_BINARY_IMAGES}" in
+		usb-hdd)
+			if [ -f "${SYSLINUX_PATH}/exithelp.cfg" ]
+			then
+				sed -i -e "s|config isolinux.cfg|config syslinux.cfg|" "${SYSLINUX_PATH}"/exithelp.cfg
+			fi
+			;;
+
+		net)
+			if [ -f "${SCREEN_PATH}/exithelp.cfg" ]
+			then
+				sed -i -e "s|config isolinux.cfg|config ${LIVE_KERNEL_PATH}/pxelinux.cfg/default|" "${SCREEN_PATH}"/exithelp.cfg
+			fi
+			;;
+	esac
 
 	# Syslinux v3.31 in etch does not support include statements
 	if [ "${LH_DISTRIBUTION}" = "etch" ]

-- 
live-helper