[SCM] debian-live/live-helper branch, master, updated. 1.0_a39-1-13-g92a0b19

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 8a19cbfff1b9dac2bcb16628c8d1a6d905292d2c
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Mar 6 03:10:35 2008 +0000

    Ensure syslinux entry names match templates and standard d-i names
    
    This patch alters the syslinux labels to follow the "expert" and
    "expertgui" style in favour of "TextExpert" and "GUIExpert".
    
    This makes the names match Live Helper's syslinux templates, as well as the
    more typical d-i installations and numerious sources that claim that one
    should "just type 'expert' at the syslinux prompt", etc.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 34c8e24..ba0d572 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -162,7 +162,16 @@ Syslinux_install_entry ()
 				;;
 		esac
 
-		LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}${TYPE}\n"
+		case "${LABEL}" in
+			Text)
+				TYPE_SUFFIX=""
+				;;
+			GUI)
+				TYPE_SUFFIX="gui"
+				;;
+		esac
+
+		LINUX_INSTALL="${LINUX_INSTALL}\nLABEL $(echo "${TYPE}" | tr A-Z a-z)${TYPE_SUFFIX}\n"
 		LINUX_INSTALL="${LINUX_INSTALL}\tMENU LABEL Start ${LABEL} ${TYPE}\n"
 		LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${LIVE_INSTALL_KERNEL_PATH}/${KERNEL}\n"
 		LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\n"

-- 
debian-live/live-helper