summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-03-06 03:10:35 +0000
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:01:42 +0100
commitf1cb2b04328e001ce25128ffc1c89764c7bac536 (patch)
tree1bdb93931aa5c8124a1947fc88b077cb7739a8c3
parentacf66f3c52d5c8530c5094fda011dbd3cd5b9f01 (diff)
downloadlive-build-f1cb2b04328e001ce25128ffc1c89764c7bac536.zip
live-build-f1cb2b04328e001ce25128ffc1c89764c7bac536.tar.gz
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.
-rwxr-xr-xhelpers/lh_binary_syslinux11
1 files changed, 10 insertions, 1 deletions
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"