[SCM] Debian Live build scripts branch, master, updated. 1.0.3-1-25-g39514db

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 39514db7bc3c723c6cc7598841f3ee53a81e9781
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Feb 8 13:25:44 2009 +0100

    Really correcting bootstrap default logic to not overwrite the 'copy' method.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index f686b73..d057602 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -85,7 +85,7 @@ Set_defaults ()
 	LH_APT_SECURE="${LH_APT_SECURE:-enabled}"
 
 	# Setting bootstrap program
-	if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "${LH_BOOTSTRAP}" ] || [ "${LH_BOOTSTRAP}" != "copy" ]
+	if [ -z "${LH_BOOTSTRAP}" ] || ( [ ! -x "${LH_BOOTSTRAP}" ] && [ "${LH_BOOTSTRAP}" != "copy" ] )
 	then
 		if [ -x "/usr/sbin/debootstrap" ]
 		then

-- 
Debian Live build scripts