[SCM] live-helper branch, master, updated. 1.0.5-2-29-g9471995

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d3260f462f0b92104bfea086e0b187a3d6300419
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Oct 20 16:13:20 2009 +0200

    Allow to enforce syslinux menu module through LH_SYSLINUX_MENU.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index b161a62..c9f7b5c 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -179,8 +179,24 @@ Copy_syslinux_templates ()
 	else
 		cp "${TEMPLATES}"/menu/* ${SCREEN_PATH}
 
-		# Grab menu binary
-		MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+		case "${LH_SYSLINUX_MENU}" in
+			gfxboot)
+				# to be implemented
+				;;
+
+			menu)
+				MENUMODULE="menu.c32"
+				;;
+
+			vesamenu)
+				MENUMODULE="vesamenu.c32"
+				;;
+
+			*)
+				MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+				;;
+		esac
+
 		case "${LH_CHROOT_BUILD}" in
 			enabled)
 				cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}

-- 
live-helper