diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-09-25 14:16:14 -0300 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:27 +0100 |
| commit | 6944ddd54d716cb11fbd2f4a0710725895ee924f (patch) | |
| tree | aabdeff12eef0d348bed1e2a67bb5743e4497d77 /helpers | |
| parent | 7f9d996f19f1454ae8f525042a2d98c91142f963 (diff) | |
| download | live-build-6944ddd54d716cb11fbd2f4a0710725895ee924f.zip live-build-6944ddd54d716cb11fbd2f4a0710725895ee924f.tar.gz | |
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.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_syslinux | 10 |
1 files 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" |