From 5166362009fcb3014507e8ce60d32276e38cbc18 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Wed, 19 Nov 2008 12:22:16 -0800
Subject: Copy menu binary from the correct directory

---
 helpers/lh_binary_syslinux | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index cadb1f4..2d7cf33 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}" ]
-- 
cgit v1.0