[SCM] Debian Live build scripts branch, master, updated. 1.0.1-1-7-g44c3ec8

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 44c3ec8bd58c7c98d6681aa84d0863105dc5b0bc
Author: Maximilian Gass <mxey at cloudconnected.org>
Date:   Thu Sep 25 17:07:35 2008 +0200

    Only install memtest in lh_binary_syslinux if enabled.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 69a6ced..1763519 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -488,7 +488,11 @@ if [ "binary/${INITFS}" != "${KERNEL_PATH}" ]
 then
 	mv binary/${INITFS}/vmlinuz* ${KERNEL_PATH}
 	mv binary/${INITFS}/initrd* ${KERNEL_PATH}
-	mv binary/${INITFS}/memtest ${KERNEL_PATH}
+
+	if [ "${LH_MEMTEST}" != "disabled" ] && [ "${LH_MEMTEST}" != "none" ]
+	then
+		mv binary/${INITFS}/memtest ${KERNEL_PATH}
+	fi
 fi
 
 # Default entries

-- 
Debian Live build scripts