From 6944ddd54d716cb11fbd2f4a0710725895ee924f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 25 Sep 2007 14:16:14 -0300 Subject: syslinux: always output MENU LABEL since they're ignored if menu.c32 isn't loaded syslinux ignores MENU LABEL commands if there's no menu.c32 module loaded and then we don't need about check it. --- helpers/lh_binary_syslinux | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 9736377..a1e1247 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -83,10 +83,7 @@ Syslinux_memtest_entry () MEMTEST="${MEMTEST}\nLABEL ${LABEL}\n" # Write the menu label if the syslinux menu is being use - if [ "${LH_SYSLINUX_MENU}" != "disabled" ] - then - MEMTEST="${MEMTEST}\tMENU LABEL ${MENULABEL}\n" - fi + MEMTEST="${MEMTEST}\tMENU LABEL ${MENULABEL}\n" MEMTEST="${MEMTEST}\tkernel /${KERNEL}\n" MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's#//#/#g')" @@ -111,10 +108,7 @@ Syslinux_live_entry () LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n" # Write the menu label if the syslinux menu is being use - if [ "${LH_SYSLINUX_MENU}" != "disabled" ] - then - LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL}\n" - fi + LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL}\n" LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}\n" -- cgit v1.0