summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-08-27 15:38:27 +0200
committerDaniel Baumann <daniel@debian.org>2012-08-27 16:05:46 +0200
commitddd0ef9dc024028c4a5da936dc43c71182e9889f (patch)
tree73828cff3627b8683f049e4598394c36bd289e9e /scripts
parentb6da4aec0426e111f06b2693c292cc57cc8c9e5a (diff)
downloadvyos-live-build-ddd0ef9dc024028c4a5da936dc43c71182e9889f.tar.gz
vyos-live-build-ddd0ef9dc024028c4a5da936dc43c71182e9889f.zip
Moving aborting when no bootstrap tool is installed from defaults to the respective bootstrap script.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_bootstrap_cdebootstrap8
-rwxr-xr-xscripts/build/lb_bootstrap_debootstrap8
2 files changed, 16 insertions, 0 deletions
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index e8fabe3f6..931c837f0 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -29,6 +29,14 @@ then
exit 0
fi
+if [ ! -x "$(which cdebootstrap 2>/dev/null)" ]
+then
+ echo "E: cdebootstrap - command not found"; \
+ echo "I: cdebootstrap can be optained from http://ftp.debian.org/debian/pool/main/d/cdebootstrap/"; \
+ echo "I: On Debian based systems, cdebootstrap can be installed with 'apt-get install debootstrap'."; \
+ exit 1
+fi
+
# Check architecture
Check_crossarchitectures
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index 901b90797..d9a4e8212 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -29,6 +29,14 @@ then
exit 0
fi
+if [ ! -x "$(which debootstrap 2>/dev/null)" ]
+then
+ echo "E: debootstrap - command not found"; \
+ echo "I: debootstrap can be optained from http://ftp.debian.org/debian/pool/main/d/debootstrap/"; \
+ echo "I: On Debian based systems, debootstrap can be installed with 'apt-get install debootstrap'."; \
+ exit 1
+fi
+
# Check architecture
Check_crossarchitectures