[SCM] debian-live/live-helper branch, master, updated. 1.0_a27-1-57-g8fa8db6

[Daniel Baumann]

The branch, master has been updated
       via  8fa8db6324249d771a07994d0b9df3d946210bfb (commit)
       via  90ffcda4b36736dad7d15ebc0dfbbcf7b13e0e1c (commit)
      from  8049aeb02414bc87c75041e83241817d29653f4f (commit)


- Shortlog ------------------------------------------------------------
8fa8db6 syslinux: always output MENU LABEL since they're ignored if menu.c32 isn't loaded
90ffcda templates: move syslinux-menu to syslinux/menu

Summary of changes:
 helpers/lh_binary_syslinux               |   23 +++++++++--------------
 templates/syslinux-menu/data/lat1-16.psf |  Bin 5156 -> 0 bytes
 templates/syslinux-menu/data/splash.png  |  Bin 57186 -> 0 bytes
 templates/syslinux-menu/isolinux.cfg     |   23 -----------------------
 templates/syslinux/menu/data/lat1-16.psf |  Bin 0 -> 5156 bytes
 templates/syslinux/menu/data/splash.png  |  Bin 0 -> 57186 bytes
 templates/syslinux/menu/syslinux.cfg     |   23 +++++++++++++++++++++++
 7 files changed, 32 insertions(+), 37 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 8fa8db6324249d771a07994d0b9df3d946210bfb
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Sep 25 14:16:14 2007 -0300

    syslinux: always output MENU LABEL since they're ignored if menu.c32 isn't loaded
    
    syslinux ignores MENU LABEL commands if there's no menu.c32 module
    loaded and then we don't need about check it.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 9736377..a1e1247 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -83,10 +83,7 @@ Syslinux_memtest_entry ()
 	MEMTEST="${MEMTEST}\nLABEL ${LABEL}\n"
 
 	# Write the menu label if the syslinux menu is being use
-	if [ "${LH_SYSLINUX_MENU}" != "disabled" ]
-	then
-		MEMTEST="${MEMTEST}\tMENU LABEL ${MENULABEL}\n"
-	fi
+	MEMTEST="${MEMTEST}\tMENU LABEL ${MENULABEL}\n"
 
 	MEMTEST="${MEMTEST}\tkernel /${KERNEL}\n"
 	MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's#//#/#g')"
@@ -111,10 +108,7 @@ Syslinux_live_entry ()
 	LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
 
 	# Write the menu label if the syslinux menu is being use
-	if [ "${LH_SYSLINUX_MENU}" != "disabled" ]
-	then
-		LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL}\n"
-	fi
+	LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL}\n"
 
 	LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}\n"

commit 90ffcda4b36736dad7d15ebc0dfbbcf7b13e0e1c
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Sep 25 14:01:44 2007 -0300

    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.

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
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

-- 
debian-live/live-helper