[SCM] debian-live/live-helper branch, master, updated. 1.0_a28-1-10-g42314d3

[Daniel Baumann]

The branch, master has been updated
       via  42314d320c25e8036bf9b816a7317809ab75aeff (commit)
      from  9e3c00fb39e16c595faa99ebb251edf2d73c7537 (commit)


- Shortlog ------------------------------------------------------------
42314d3 helpers/lh_source_debian

Summary of changes:
 helpers/lh_source_debian |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 42314d320c25e8036bf9b816a7317809ab75aeff
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 19 09:16:21 2007 +0200

    helpers/lh_source_debian
    
      * Handling case when memtest is disabled.

diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index e939e6c..8e60000 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -76,12 +76,15 @@ case "${LH_ARCHITECTURE}" in
 	amd64|i386)
 
 cat >> chroot/root/dpkg-selection.txt << EOF
-${LH_MEMTEST}
 mtools
 syslinux
 grub
 EOF
 
+if [ "${LH_MEMTEST}" != "disabled" ] && [ "${LH_MEMTEST}" != "none" ]
+then
+	echo "${LH_MEMTEST}" >> chroot/root/dpkg-selection.txt
+fi
 		;;
 
 	powerpc)

-- 
debian-live/live-helper