From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 23 Jan 2019 08:22:53 +0000 (+0100)
Subject: Install apt-transport-https during debootstrap
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=99c14d50fdc0b589e6cd8f118241a7ca8e2fc707;p=mirror%2Fdsa-puppet.git

Install apt-transport-https during debootstrap
---

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 8a6926b39..074a14278 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -346,6 +346,12 @@ if ! [ -e "$script" ]; then
     fi
 fi
 
+case "$suite" in
+  stretch|jessie|precise|trusty|xenial)
+    include="$include,apt-transport-https"
+    ;
+esac
+
 set -x
 debootstrap \
     --keyring "$keyring" \
@@ -394,16 +400,6 @@ chmod +x "$rootdir/usr/local/sbin/policy-rc.d"
 [ -z "$bare" ] && [ -z "$ubuntu" ] && chroot "$rootdir" apt-get install -y --no-install-recommends locales-all
 chroot "$rootdir" apt-get install -y --no-install-recommends build-essential
 [ -z "$bare" ] && chroot "$rootdir" apt-get install -y --no-install-recommends zsh less vim fakeroot devscripts gdb
-if [ -n "$buildd" ] ; then
-    case "$suite" in
-      wheezy|jessie|stretch)
-        chroot "$rootdir" apt-get install -y --no-install-recommends apt-transport-https ca-certificates
-        ;;
-      *)
-        chroot "$rootdir" apt-get install -y --no-install-recommends ca-certificates
-        ;;
-    esac
-fi
 if [ -n "$ubuntu" ]; then
   echo "deb $mirror ${suite}-updates main" >> "$rootdir/etc/apt/sources.list"
   echo "deb $mirror ${suite}-security main" >> "$rootdir/etc/apt/sources.list"