manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Otavio Salvador 2007-09-25 14:16:14 -03:00 committed by Daniel Baumann
parent 7f9d996f19
commit 6944ddd54d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helpers/lh_binary_syslinux
View File

@ -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"