summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-10-20 16:16:01 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:47 +0100
commit74f7986e692305050019cca2c9c74868782e98e9 (patch)
tree0f163ff051b0f540c355a4c4b345a489683b55e9 /helpers
parente5f7eea5db42bafb6be7ac8fb983f66936ad353d (diff)
downloadvyos-live-build-74f7986e692305050019cca2c9c74868782e98e9.tar.gz
vyos-live-build-74f7986e692305050019cca2c9c74868782e98e9.zip
Respecting (possibly) customized LH_SYSLINUX_CFG when autodecting syslinux menu module (Closes: #533846).
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_syslinux4
1 files changed, 3 insertions, 1 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index c9f7b5ce6..6a064adcc 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -193,7 +193,9 @@ Copy_syslinux_templates ()
;;
*)
- MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+ 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')
;;
esac