Work with proper mirror URLs

diff --git a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
index 7ab9bca531adfe19573150527adced9ecbb179e7..1625f5afff191b3c79564f8e0676e2c64534d201 100755 (executable)
--- a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
@@ -22,12 +22,12 @@ fi
 if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
   SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
   rm -f "$SRCL"
-  mirror=${MIRROR:-cdn.debian.net}
+  mirror=${MIRROR:-http://cdn.debian.net/debian}
 
   case "${SUITE_BASE:-}" in
     experimental)
-      echo "deb     http://$mirror/debian/ sid main" >> "$SRCL"
-      echo "deb-src http://$mirror/debian/ sid main" >> "$SRCL"
+      echo "deb     $mirror sid main" >> "$SRCL"
+      echo "deb-src $mirror sid main" >> "$SRCL"
       ;;
     sid)
       ;;
@@ -36,8 +36,8 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
       echo "deb-src http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
       ;;
   esac
-  echo "deb     http://$mirror/debian/ ${SUITE_BASE} main" >> "$SRCL"
-  echo "deb-src http://$mirror/debian/ ${SUITE_BASE} main" >> "$SRCL"
+  echo "deb     $mirror ${SUITE_BASE} main" >> "$SRCL"
+  echo "deb-src $mirror ${SUITE_BASE} main" >> "$SRCL"
 
   case "${SUITE_VARIANT:-}" in
     backports)
@@ -47,8 +47,8 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
           echo "deb-src http://backports.debian.org/debian-backports/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
           ;;
         *)
-          echo "deb     http://$mirror/debian/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
-          echo "deb-src http://$mirror/debian/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb     $mirror ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb-src $mirror ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
           ;;
       esac
       ;;

diff --git a/modules/porterbox/files/setup-dchroot b/modules/porterbox/files/setup-dchroot
index 0cba6fa12f1e5af1958e1dc22e0e269757aca444..862e99f1397f4d9c6aa59c18e3674b6b5f063470 100755 (executable)
--- a/modules/porterbox/files/setup-dchroot
+++ b/modules/porterbox/files/setup-dchroot
@@ -112,7 +112,7 @@ arch="$THISARCH"
 if [ -e /etc/schroot/dsa/default-mirror ]; then
     mirror=$(cat /etc/schroot/dsa/default-mirror )
 fi
-mirror="${mirror:-cdn.debian.net}"
+mirror="${mirror:-http://cdn.debian.net/debian}"
 force=""
 basedir="/srv/chroot"
 declare -a cleanup
@@ -176,7 +176,7 @@ debootstrap \
     --include="apt" \
     --variant=buildd \
     --arch="$arch" \
-    "$suite" "$rootdir" "http://$mirror/debian"
+    "$suite" "$rootdir" "$mirror"
 echo "$tuple" > $rootdir/etc/debian_chroot
 
 chroot "$rootdir" apt-get update