diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-09-25 14:16:14 -0300 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-09-25 20:21:04 +0200 |
| commit | 8fa8db6324249d771a07994d0b9df3d946210bfb (patch) | |
| tree | aabdeff12eef0d348bed1e2a67bb5743e4497d77 /helpers | |
| parent | 90ffcda4b36736dad7d15ebc0dfbbcf7b13e0e1c (diff) | |
| download | vyos-live-build-8fa8db6324249d771a07994d0b9df3d946210bfb.tar.gz vyos-live-build-8fa8db6324249d771a07994d0b9df3d946210bfb.zip | |
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 97363776f..a1e124798 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" |