From cea57867f5783e57986f4ad05ddbf56f3cc18141 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 15 Nov 2009 16:29:34 +0100
Subject: Adding another workaround for etchs syslinux generation to manually
 treat live.cfg.

---
 helpers/lh_binary_syslinux | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 154306ff1..813084c97 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" ]
-- 
cgit v1.2.3