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>2008-03-09 09:56:10 +0100
commit8a19cbfff1b9dac2bcb16628c8d1a6d905292d2c (patch)
tree1bdb93931aa5c8124a1947fc88b077cb7739a8c3
parentbf4e15bff2d8a455ea25b2fe1df03a534d67ea47 (diff)
downloadvyos-live-build-8a19cbfff1b9dac2bcb16628c8d1a6d905292d2c.tar.gz
vyos-live-build-8a19cbfff1b9dac2bcb16628c8d1a6d905292d2c.zip
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@chris-lamb.co.uk>
-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 34c8e2481..ba0d572f8 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"