From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 23 Jan 2019 12:47:42 +0000 (+0100)
Subject: Try to support debootstrapping from https sources on debian.org infra
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=660ae219dc498840a7d4c38a371429d6a613431e;p=mirror%2Fdsa-puppet.git

Try to support debootstrapping from https sources on debian.org infra
---

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 1c90409be..7f372fe9e 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -353,8 +353,17 @@ case "$suite" in
     ;;
 esac
 
+bindir=$(mktemp -d)
+cleanup+=("rm -r $bindir")
+cat > "$bindir/wget" << 'EOF'
+#!/bin/sh
+exec /usr/bin/wget --ca-directory=/etc/ssl/ca-global "$@"
+EOF
+chmod +x "$bindir/wget"
+
 set -x
-debootstrap \
+PATH="$bindir:$PATH" \
+  debootstrap \
     --keyring "$keyring" \
     --include="$include" \
     --variant=buildd \