From 90ffcda4b36736dad7d15ebc0dfbbcf7b13e0e1c Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 25 Sep 2007 14:01:44 -0300
Subject: [PATCH] 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.
---
 helpers/lh_binary_syslinux                         |  13 +++++++------
 .../menu}/data/lat1-16.psf                         | Bin
 .../menu}/data/splash.png                          | Bin
 .../isolinux.cfg => syslinux/menu/syslinux.cfg}    |   0
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename templates/{syslinux-menu => syslinux/menu}/data/lat1-16.psf (100%)
 rename templates/{syslinux-menu => syslinux/menu}/data/splash.png (100%)
 rename templates/{syslinux-menu/isolinux.cfg => syslinux/menu/syslinux.cfg} (100%)

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
similarity index 100%
rename from templates/syslinux-menu/data/lat1-16.psf
rename to templates/syslinux/menu/data/lat1-16.psf
diff --git a/templates/syslinux-menu/data/splash.png b/templates/syslinux/menu/data/splash.png
similarity index 100%
rename from templates/syslinux-menu/data/splash.png
rename to templates/syslinux/menu/data/splash.png
diff --git a/templates/syslinux-menu/isolinux.cfg b/templates/syslinux/menu/syslinux.cfg
similarity index 100%
rename from templates/syslinux-menu/isolinux.cfg
rename to templates/syslinux/menu/syslinux.cfg