diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2008-11-19 12:22:16 -0800 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:45 +0100 |
| commit | 5166362009fcb3014507e8ce60d32276e38cbc18 (patch) | |
| tree | 43bc53bfc8a72d6aa826af7a0d32a32e04584cc4 | |
| parent | 55254a01fdf9289a38ad7478d9b779f2ba53b15c (diff) | |
| download | vyos-live-build-5166362009fcb3014507e8ce60d32276e38cbc18.tar.gz vyos-live-build-5166362009fcb3014507e8ce60d32276e38cbc18.zip | |
Copy menu binary from the correct directory
| -rwxr-xr-x | helpers/lh_binary_syslinux | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index cadb1f489..2d7cf33ab 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -186,9 +186,16 @@ Copy_syslinux_templates () cp "${TEMPLATES}"/menu/*.cfg ${SCREEN_PATH} cp "${TEMPLATES}"/menu/data/* ${DATA_PATH} - # Grab menu binary from chroot + # Grab menu binary MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g') - cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH} + case "${LH_CHROOT_BUILD}" in + enabled) + cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH} + ;; + disabled) + cp /usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH} + ;; + esac fi if [ -d "${TEMPLATES}"/"${LH_LANGUAGE}" ] |