summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-11-15 16:38:05 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:49 +0100
commita072f129799f4843e9b784a6e44dafa3c4c58b79 (patch)
treec561993165a3b2f40a1c0958a102c63a161e96aa
parentcea57867f5783e57986f4ad05ddbf56f3cc18141 (diff)
downloadlive-build-a072f129799f4843e9b784a6e44dafa3c4c58b79.zip
live-build-a072f129799f4843e9b784a6e44dafa3c4c58b79.tar.gz
Only adding hardcoded fallback syslinux label when not using neither vesamenu nor gfxboot.
-rwxr-xr-xhelpers/lh_binary_syslinux9
1 files 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" ]