From a072f129799f4843e9b784a6e44dafa3c4c58b79 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 15 Nov 2009 16:38:05 +0100
Subject: Only adding hardcoded fallback syslinux label when not using neither
 vesamenu nor gfxboot.

---
 helpers/lh_binary_syslinux | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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" ]
-- 
cgit v1.0