From fd323f71240c1fa08fd3be20277d1c285dba9957 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 31 Jan 2009 11:22:23 +0100
Subject: [PATCH] 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.
---
functions/defaults.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 7db1389d0..973bfc094 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).