[SCM] live-helper branch, master, updated. 1.0.5-2-66-g968f328

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 968f328e97f638a9c2914292ce157817b32b4e9a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 15 14:20:01 2009 +0100

    Respecting that etch has no prompt.cfg in netboot images.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 73a8a30..0501996 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -650,7 +650,10 @@ case "${LH_BINARY_IMAGES}" in
 			sed -i -e "s|^include |include ${LIVE_SCREEN_PATH}/|g" "${FILE}"
 		done
 
-		sed -i -e "s| f| ${LIVE_SCREEN_PATH}/f|g" ${SCREEN_PATH}/prompt.cfg
+		if [ "${LH_DISTRIBUTION}" != "etch" ]
+		then
+			sed -i -e "s| f| ${LIVE_SCREEN_PATH}/f|g" ${SCREEN_PATH}/prompt.cfg
+		fi
 
 		mv ${SCREEN_PATH}/syslinux.cfg ${KERNEL_PATH}/pxelinux.cfg/default
 

-- 
live-helper