summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-09-25 14:01:44 -0300
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:27 +0100
commit7f9d996f19f1454ae8f525042a2d98c91142f963 (patch)
tree8b051189ac704e1b417951c262828e737503e227 /helpers
parentfb925a42146264a44abb276654c0696c761801d4 (diff)
downloadlive-build-7f9d996f19f1454ae8f525042a2d98c91142f963.zip
live-build-7f9d996f19f1454ae8f525042a2d98c91142f963.tar.gz
templates: move syslinux-menu to syslinux/menu
All files from syslinux-menu templates directory has been moved to syslinux/menu. lh_binary_syslinux had some changes to work with that but they were minimal ones.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_syslinux13
1 files changed, 7 insertions, 6 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 3f8cb40..9736377 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -47,12 +47,7 @@ Require_stagefile .stage/bootstrap
Check_stagefile .stage/binary_syslinux
# Checking syslinux templates
-if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
-then
- Check_templates syslinux
-else
- Check_templates syslinux-menu
-fi
+Check_templates syslinux
# Checking lock file
Check_lockfile .lock
@@ -363,7 +358,13 @@ case "${LH_BINARY_IMAGES}" in
;;
esac
+ # Syslinux templates
cp -r "${TEMPLATES}"/common/* binary/isolinux
+ if [ "${LH_SYSLINUX_MENU}" != "disabled" ]
+ then
+ cp -r "${TEMPLATES}"/menu/* binary/isolinux
+ fi
+
if [ -d "${TEMPLATES}"/"${LH_LANGUAGE}" ]
then
cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* binary/isolinux