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

[Daniel Baumann]

The branch, master has been updated
       via  66aee6f0778c935b0d8824592fb27f078a48a5da (commit)
       via  0ae32ca1b9216db39b6f8859f7dbb297a3e3ee24 (commit)
       via  ae7d46ca728ca4369981f5601bd5962e186e2248 (commit)
      from  19665871627e38ce7411f3d91c87b7966baae333 (commit)


- Shortlog ------------------------------------------------------------
66aee6f syslinux: fix module detection otherwise it won't be copied
0ae32ca syslinux: fix memcheck path since it was using the wrong path
ae7d46c templates: split syslinux templates to reduce diverting

Summary of changes:
 helpers/lh_binary_syslinux             |    4 ++--
 templates/syslinux/common/help.cfg     |   10 ++++++++++
 templates/syslinux/common/menu.cfg     |    2 --
 templates/syslinux/common/prompt.cfg   |   15 ---------------
 templates/syslinux/common/syslinux.cfg |    3 ---
 templates/syslinux/menu/prompt.cfg     |    6 ++++++
 templates/syslinux/normal/prompt.cfg   |    6 ++++++
 7 files changed, 24 insertions(+), 22 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 66aee6f0778c935b0d8824592fb27f078a48a5da
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Oct 2 15:00:34 2007 -0300

    syslinux: fix module detection otherwise it won't be copied

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index b6cb845..655a424 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -413,7 +413,7 @@ case "${LH_BINARY_IMAGES}" in
 		# Copying menu module
 		if [ "${LH_SYSLINUX_MENU}" != "disabled" ]
 		then
-			MENUPATH="$(grep 'menu.c32' binary/isolinux/header.cfg | sed 's,DEFAULT\s*\(.*menu.c32\)$,\1,g')"
+			MENUPATH="$(grep 'menu.c32' binary/isolinux/header.cfg | sed 's,default\s*\(.*menu.c32\)$,\1,g')"
 			MENUMODULE="$(basename ${MENUPATH})"
 
 			mkdir -p binary/isolinux/"$(dirname ${MENUPATH})"

commit 0ae32ca1b9216db39b6f8859f7dbb297a3e3ee24
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Oct 2 20:10:20 2007 -0300

    syslinux: fix memcheck path since it was using the wrong path

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 6b28fdd..b6cb845 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -75,7 +75,7 @@ Syslinux_memtest_entry ()
 	KERNEL="${3}"
 
 	# syslinux << 3.36 lacks support to file/path
-	if [ "$(basename ${DESTDIR_LIVE})" = "binary" ]
+	if [ "$(basename ${DESTDIR_LIVE})" != "binary" ]
 	then
 		KERNEL="${DIRECTORY}/${KERNEL}"
 	fi

commit ae7d46ca728ca4369981f5601bd5962e186e2248
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Oct 2 20:25:38 2007 -0300

    templates: split syslinux templates to reduce diverting
    
    A new common template called help.cfg has been included to avoid help
    keys to be duplicated while prompt.cfg has been changed to be specific
    to each mode since it has different requirements for initial text to
    be displayed.
    
    Other minor fixes were also been done during the spliting and then
    included on this patch too.

diff --git a/templates/syslinux/common/help.cfg b/templates/syslinux/common/help.cfg
new file mode 100644
index 0000000..d06fc18
--- /dev/null
+++ b/templates/syslinux/common/help.cfg
@@ -0,0 +1,10 @@
+f1 f1.txt
+f2 f2.txt
+f3 f3.txt
+f4 f4.txt
+f5 f5.txt
+f6 f6.txt
+f7 f7.txt
+f8 f8.txt
+f9 f9.txt
+f0 f10.txt
diff --git a/templates/syslinux/common/menu.cfg b/templates/syslinux/common/menu.cfg
index f84260c..093ca0f 100644
--- a/templates/syslinux/common/menu.cfg
+++ b/templates/syslinux/common/menu.cfg
@@ -1,5 +1,3 @@
-default live
-
 LINUX_LIVE
 
 LINUX_INSTALL
diff --git a/templates/syslinux/common/prompt.cfg b/templates/syslinux/common/prompt.cfg
deleted file mode 100644
index 32dd85c..0000000
--- a/templates/syslinux/common/prompt.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-prompt 1
-display boot.txt
-timeout 0
-include menu.cfg
-
-f1 f1.txt
-f2 f2.txt
-f3 f3.txt
-f4 f4.txt
-f5 f5.txt
-f6 f6.txt
-f7 f7.txt
-f8 f8.txt
-f9 f9.txt
-f0 f10.txt
diff --git a/templates/syslinux/common/syslinux.cfg b/templates/syslinux/common/syslinux.cfg
index b930e36..83c7a8a 100644
--- a/templates/syslinux/common/syslinux.cfg
+++ b/templates/syslinux/common/syslinux.cfg
@@ -1,6 +1,3 @@
 include header.cfg
 include menu.cfg
 include footer.cfg
-DISPLAY boot.txt
-
-PROMPT 1
diff --git a/templates/syslinux/menu/prompt.cfg b/templates/syslinux/menu/prompt.cfg
new file mode 100644
index 0000000..8a46c52
--- /dev/null
+++ b/templates/syslinux/menu/prompt.cfg
@@ -0,0 +1,6 @@
+prompt 1
+timeout 0
+default live
+display f1.txt
+include menu.cfg
+include help.cfg
diff --git a/templates/syslinux/normal/prompt.cfg b/templates/syslinux/normal/prompt.cfg
new file mode 100644
index 0000000..26d5517
--- /dev/null
+++ b/templates/syslinux/normal/prompt.cfg
@@ -0,0 +1,6 @@
+prompt 1
+timeout 0
+default live
+display boot.txt
+include menu.cfg
+include help.cfg

-- 
debian-live/live-helper