[SCM] debian-live/live-helper branch, master, updated. 1.0_a30-1-12-g883594e

[Otavio Salvador]

The branch, master has been updated
       via  883594ed649731db18a0121aad37bb08897f3361 (commit)
       via  4d6271dddbb38da5e3032e19701e7c18afa0bbe0 (commit)
      from  9b189a62554f21397792ba3081d588721eb9a2e4 (commit)


- Shortlog ------------------------------------------------------------
883594e syslinux: fix usb-hdd templates coping
4d6271d syslinux: properly change timeout and do not fail if help files do not exists

Summary of changes:
 helpers/lh_binary_syslinux |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 883594ed649731db18a0121aad37bb08897f3361
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Oct 9 13:04:56 2007 -0300

    syslinux: fix usb-hdd templates coping

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 589c348..8c6887f 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -603,6 +603,12 @@ case "${LH_BINARY_IMAGES}" in
 		esac
 
 		cp -r "${TEMPLATES}"/common/* "${DESTDIR}"
+		if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
+		then
+			cp -r "${TEMPLATES}"/normal/* "${DESTDIR}"
+		else
+			cp -r "${TEMPLATES}"/menu/* "${DESTDIR}"
+		fi
 		cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* "${DESTDIR}"
 
 		for FILE in "${DESTDIR}"/*.live

commit 4d6271dddbb38da5e3032e19701e7c18afa0bbe0
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Oct 9 10:27:27 2007 -0300

    syslinux: properly change timeout and do not fail if help files do not exists

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index a6f3067..589c348 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -656,10 +656,15 @@ case "${LH_BINARY_IMAGES}" in
 		# Configure syslinux templates
 		sed -i -e "s at LINUX_LIVE@${LINUX_LIVE}@" -e "s at LINUX_INSTALL@${LINUX_INSTALL}@" -e "s at MEMTEST@${MEMTEST}@" "${DESTDIR}"/menu.cfg
 		sed -i -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" "${DESTDIR}"/menu.cfg
-		sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/$(date +%Y%m%d)/" -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f1.txt #FIXME
-		sed -i -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME
-		sed -i -e "s/LH_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
-
+		if [ -e binary/isolinux/f1.txt ]
+		then
+			sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/$(date +%Y%m%d)/" -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f1.txt
+		fi
+		sed -i -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f3.txt
+		if [ -e binary/isolinux/f10.txt ]
+		then
+			sed -i -e "s/LH_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
+		fi
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 		if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
 		then
@@ -676,11 +681,11 @@ case "${LH_BINARY_IMAGES}" in
 			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
 			mv "${DESTDIR_LIVE}"/initrd.img-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
 			sed -i -e "s/vmlinuz-.*-${LH_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LH_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/menu.cfg
-			sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" "${DESTDIR}"/menu.cfg
-
-			# Remove whitespaces
-			sed -i -e 's/\ $//g' "${DESTDIR}"/menu.cfg
+			sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" "${DESTDIR}"/footer.cfg
 		fi
+
+		# Remove whitespaces
+		sed -i -e 's/\ $//g' "${DESTDIR}"/*.cfg
 		;;
 esac
 

-- 
debian-live/live-helper