[SCM] Debian Live build scripts branch, master, updated. 1.0.1-2-5-gd5e4eae
An-Cheng Huang
ancheng at vyatta.com
Thu Nov 20 20:42:34 UTC 2008
The following commit has been merged in the master branch:
commit d5e4eae179c4b7568df558512418da6ca2908999
Author: An-Cheng Huang <ancheng at vyatta.com>
Date: Wed Nov 19 12:22:16 2008 -0800
Copy menu binary from the correct directory
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}" ]
--
Debian Live build scripts
More information about the debian-live-changes
mailing list