[SCM] live-helper branch, master, updated. 1.0.5-2-68-gb218089

[Daniel Baumann]

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

    Adding another workaround for etchs syslinux generation to manually treat live.cfg.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 154306f..813084c 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -357,7 +357,7 @@ Configure_syslinux_templates ()
 	then
 		while grep -qs ^include ${SCREEN_PATH}/syslinux.cfg
 		do
-			INCLUDES=$(grep ^include ${SCREEN_PATH}/syslinux.cfg |awk '{print $2}')
+			INCLUDES=$(grep ^include ${SCREEN_PATH}/syslinux.cfg | awk '{print $2}')
 
 			for FILE_PATH in ${INCLUDES}
 			do
@@ -376,6 +376,12 @@ Configure_syslinux_templates ()
 			done
 		done
 
+		if [ -e ${SCREEN_PATH}/live.cfg ]
+		then
+			cat ${SCREEN_PATH}/live.cfg >> ${SCREEN_PATH}/syslinux.cfg
+			rm -f ${SCREEN_PATH}/live.cfg
+		fi
+
 		# Syslinux v3.31 in etch does not support sub directories, /path/kernel,
 		# when using FAT hard drive images, remove leading /'s
 		if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]

-- 
live-helper