summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhelpers/lh_binary_syslinux13
-rw-r--r--templates/syslinux/menu/data/lat1-16.psf (renamed from templates/syslinux-menu/data/lat1-16.psf)bin5156 -> 5156 bytes
-rw-r--r--templates/syslinux/menu/data/splash.png (renamed from templates/syslinux-menu/data/splash.png)bin57186 -> 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 3f8cb4093..97363776f 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
index 097a640f3..097a640f3 100644
--- a/templates/syslinux-menu/data/lat1-16.psf
+++ b/templates/syslinux/menu/data/lat1-16.psf
Binary files differ
diff --git a/templates/syslinux-menu/data/splash.png b/templates/syslinux/menu/data/splash.png
index 566961567..566961567 100644
--- a/templates/syslinux-menu/data/splash.png
+++ b/templates/syslinux/menu/data/splash.png
Binary files differ
diff --git a/templates/syslinux-menu/isolinux.cfg b/templates/syslinux/menu/syslinux.cfg
index 887e3d8a4..887e3d8a4 100644
--- a/templates/syslinux-menu/isolinux.cfg
+++ b/templates/syslinux/menu/syslinux.cfg