summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-02-14 11:07:17 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:42 +0100
commita31541517b344d447fd5129ce4d6e0d222166635 (patch)
treeb25cf1f6b20324e28c332c82a808bfee8de0434e /functions
parent91292830259f7dbe65fec8a0c486bddf1c9fe37a (diff)
downloadlive-build-a31541517b344d447fd5129ce4d6e0d222166635.zip
live-build-a31541517b344d447fd5129ce4d6e0d222166635.tar.gz
Updating syslinux menu configuration.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh23
1 files changed, 20 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index c01e7ba..4fb6e76 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -750,11 +750,28 @@ Set_defaults ()
LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT:-0}"
# Setting syslinux menu
- LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-disabled}"
+ case "${LH_DISTRIBUTION}" in
+ etch)
+ LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-disabled}"
+ ;;
+
+ *)
+ LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU:-enabled}"
+ ;;
+ esac
# Setting syslinux menu live entries
- LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LH_ISO_APPLICATION}}"
- LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} - Fail Safe}"
+ case "${LH_MODE}" in
+ debian|debian-release)
+ LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Live}"
+ LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
+ ;;
+
+ *)
+ LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY:-Start ${LH_ISO_APPLICATION}}"
+ LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE="${LH_SYSLINUX_MENU_LIVE_ENTRY_FAILSAFE:-${LH_SYSLINUX_MENU_LIVE_ENTRY} (failsafe)}"
+ ;;
+ esac
# Settings memtest menu entry
LH_SYSLINUX_MENU_MEMTEST_ENTRY="${LH_SYSLINUX_MENU_MEMTEST_ENTRY:-Memory test}"