[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-45-g4a6ed84

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 4a6ed8439b03e01314eec5ef813881fef02b96bc
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 31 11:22:23 2009 +0100

    Overwriting the debootstrap or fdisk program if it is set to a value that is not on the host system anymore, but another alternative of it is.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 7db1389..973bfc0 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}" ]
+	if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "${LH_BOOTSTRAP}" ]
 	then
 		if [ -x "/usr/sbin/debootstrap" ]
 		then
@@ -94,8 +94,7 @@ Set_defaults ()
 		then
 			LH_BOOTSTRAP="cdebootstrap"
 		else
-			Echo_error "Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install"
-			Echo_error "debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
+			Echo_error "Cannot find /usr/sbin/debootstrap or /usr/bin/cdebootstrap. Please install debootstrap or cdebootstrap, or specify an alternative bootstrapping utility."
 			exit 1
 		fi
 	fi
@@ -146,7 +145,7 @@ Set_defaults ()
 	fi
 
 	# Setting fdisk
-	if [ -z "${LH_FDISK}" ]
+	if [ -z "${LH_FDISK}" ] || [ ! -x "${LH_FDISK}" ]
 	then
 		# Workaround for gnu-fdisk divertion
 		# (gnu-fdisk is buggy, #445304).

-- 
Debian Live build scripts