summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-11-01 13:35:56 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:48 +0100
commitbcb1e6f7d514e37df4db39fab595277f9e701ba6 (patch)
treeecc3df4044b9fcd12cc811c7e285aaf4d8cee1a2
parentfe17dbbadc2120fd34766ac95d57b73be6a8faf1 (diff)
downloadvyos-live-build-bcb1e6f7d514e37df4db39fab595277f9e701ba6.tar.gz
vyos-live-build-bcb1e6f7d514e37df4db39fab595277f9e701ba6.zip
Fixing regression imported by fixing #533846 incorrectly.
-rwxr-xr-xhelpers/lh_binary_syslinux9
1 files changed, 6 insertions, 3 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 6a064adcc..d43ce12db 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -193,9 +193,12 @@ Copy_syslinux_templates ()
;;
*)
- LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
-
- MENUMODULE=$(grep 'menu.c32' ${LH_SYSLINUX_CFG} | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+ if [ -z "${LH_SYSLINUX_CFG}" ]
+ then
+ MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+ else
+ LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
+ fi
;;
esac