[SCM] live-helper branch, master, updated. 1.0.5-2-69-g9d655e4

[Daniel Baumann]

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

    Only adding hardcoded fallback syslinux label when not using neither vesamenu nor gfxboot.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 813084c..67ba35b 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -596,8 +596,13 @@ then
 	done
 fi
 
-# Adding syslinux hardcoded default label entry
-Syslinux_live_entry "linux" "" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+# Only needed for non-vesamenu, non-gfxboot syslinux
+case "${LH_SYSLINUX_MENU}" in
+	disabled|menu)
+		# Adding syslinux hardcoded default label entry
+		Syslinux_live_entry "linux" "" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+		;;
+esac
 
 # Assembling debian-installer configuration
 if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]

-- 
live-helper