From a31541517b344d447fd5129ce4d6e0d222166635 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 14 Feb 2009 11:07:17 +0100
Subject: Updating syslinux menu configuration.

---
 functions/defaults.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'functions')

diff --git a/functions/defaults.sh b/functions/defaults.sh
index c01e7ba9d..4fb6e7655 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}"
-- 
cgit v1.2.3