summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-07-19 10:13:10 +0200
committerDaniel Baumann <daniel@debian.org>2011-07-19 10:13:10 +0200
commit57ab08226514e2270e423cce77accaff565d5a64 (patch)
treeb1ff329585e6ff607cdcaf4ab4fd5d785da87292
parent37e1c24e22a5757de7319ac12dba72eb918508a7 (diff)
downloadvyos-live-build-57ab08226514e2270e423cce77accaff565d5a64.tar.gz
vyos-live-build-57ab08226514e2270e423cce77accaff565d5a64.zip
Using --no-check-gpg option when using debootstrap >= 1.0.30 and apt secure is disabled, thanks to Eugenio Paolantonio <me@medesimo.eu> (Closes: #633356).
-rwxr-xr-xscripts/build/lb_bootstrap_debootstrap7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index bcc098043..1b5f5fe05 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -103,6 +103,13 @@ then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
fi
+# If LB_APT_SECURE is false, do not check signatures of the Release file
+# (requires debootstrap >= 1.0.30)
+if [ "${LB_APT_SECURE}" = "false" ] && /usr/sbin/debootstrap --help | grep -qs '\-\-no-check-gpg'
+then
+ DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --no-check-gpg"
+fi
+
if [ -x "/usr/sbin/debootstrap" ]
then
if [ "${LB_CACHE_PACKAGES}" = "true" ]