From 8a19cbfff1b9dac2bcb16628c8d1a6d905292d2c Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Thu, 6 Mar 2008 03:10:35 +0000 Subject: [PATCH] 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 --- helpers/lh_binary_syslinux | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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"