diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-09-25 14:01:44 -0300 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:27 +0100 |
| commit | 7f9d996f19f1454ae8f525042a2d98c91142f963 (patch) | |
| tree | 8b051189ac704e1b417951c262828e737503e227 | |
| parent | fb925a42146264a44abb276654c0696c761801d4 (diff) | |
| download | live-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.
| -rwxr-xr-x | helpers/lh_binary_syslinux | 13 | ||||
| -rw-r--r-- | templates/syslinux/menu/data/lat1-16.psf (renamed from templates/syslinux-menu/data/lat1-16.psf) | bin | 5156 -> 5156 bytes | |||
| -rw-r--r-- | templates/syslinux/menu/data/splash.png (renamed from templates/syslinux-menu/data/splash.png) | bin | 57186 -> 57186 bytes | |||
| -rw-r--r-- | templates/syslinux/menu/syslinux.cfg (renamed from templates/syslinux-menu/isolinux.cfg) | 0 |
4 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 diff --git a/templates/syslinux-menu/data/lat1-16.psf b/templates/syslinux/menu/data/lat1-16.psf Binary files differindex 097a640..097a640 100644 --- a/templates/syslinux-menu/data/lat1-16.psf +++ b/templates/syslinux/menu/data/lat1-16.psf diff --git a/templates/syslinux-menu/data/splash.png b/templates/syslinux/menu/data/splash.png Binary files differindex 5669615..5669615 100644 --- a/templates/syslinux-menu/data/splash.png +++ b/templates/syslinux/menu/data/splash.png diff --git a/templates/syslinux-menu/isolinux.cfg b/templates/syslinux/menu/syslinux.cfg index 887e3d8..887e3d8 100644 --- a/templates/syslinux-menu/isolinux.cfg +++ b/templates/syslinux/menu/syslinux.cfg |
