summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-11-21 21:05:32 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:29 +0100
commite6517de50a5aded057a612734b7e68b958d12094 (patch)
tree1359485764abe7bd3cc9f969edecf81e40bcd587 /functions
parentff9af0f960dc8b33a9a91c194180cebd42b195f8 (diff)
downloadvyos-live-build-e6517de50a5aded057a612734b7e68b958d12094.tar.gz
vyos-live-build-e6517de50a5aded057a612734b7e68b958d12094.zip
Don't fail silently when extern executables are configured but not present.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 0022a3c3d..0d89f4cb7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -79,7 +79,7 @@ Set_defaults ()
LH_APT_SECURE="${LH_APT_SECURE:-enabled}"
# Setting bootstrap program
- if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "$(which ${LH_BOOTSTRAP})" ]
+ if [ -z "${LH_BOOTSTRAP}" ]
then
if [ -x "/usr/sbin/debootstrap" ]
then
@@ -139,7 +139,7 @@ Set_defaults ()
fi
# Setting fdisk
- if [ -z "${LH_FDISK}" ] || [ ! -x "${LH_FDISK}" ]
+ if [ -z "${LH_FDISK}" ]
then
# Workaround for gnu-fdisk divertion
# (gnu-fdisk is buggy, #445304).
@@ -155,7 +155,7 @@ Set_defaults ()
fi
# Setting losetup
- if [ -z "${LH_LOSETUP}" ] || [ ! -x "${LH_LOSETUP}" ]
+ if [ -z "${LH_LOSETUP}" ]
then
# Workaround for loop-aes-utils divertion
# (loop-aes-utils' losetup lacks features).