X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fschroot%2Ffiles%2Fschroot-setup.d%2F99porterbox-extra-sources;h=c29eb157a14e4c065fe007bb5630323d0e990fcc;hb=d8092dac8d43bc6d789c26cf7e1862d5464e9b39;hp=029b3828e1f58a9aae26bdfedb11e0ac2ca64d4a;hpb=f5557bea523ac3bbab148c7990cf24a75179ff43;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
index 029b3828e..c29eb157a 100755
--- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
@@ -22,37 +22,47 @@ else
     fatal "Cannot find config script"
 fi
 
+suite_alias="$SUITE_BASE"
+case "$SUITE_ARCH" in
+    kfreebsd-*)
+        case "$SUITE_BASE" in
+            jessie)
+                suite_alias="$SUITE_BASE-kfreebsd"
+            ;;
+        esac
+        ;;
+esac
 
 if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
   SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
   rm -f "$SRCL"
-  mirror=${MIRROR:-http://cdn.debian.net/debian}
+  mirror=${MIRROR:-http://ftp.debian.org/debian}
 
   case "${SUITE_BASE:-}" in
     experimental)
       echo "deb     $mirror sid main" >> "$SRCL"
       echo "deb-src $mirror sid main" >> "$SRCL"
       ;;
-    sid|jessie)
+    sid|stretch)
       ;;
     *)
-      echo "deb     http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
-      echo "deb-src http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
+      echo "deb     http://security.debian.org/ ${suite_alias}/updates main" >> "$SRCL"
+      echo "deb-src http://security.debian.org/ ${suite_alias}/updates main" >> "$SRCL"
       ;;
   esac
-  echo "deb     $mirror ${SUITE_BASE} main" >> "$SRCL"
-  echo "deb-src $mirror ${SUITE_BASE} main" >> "$SRCL"
+  echo "deb     $mirror ${suite_alias} main" >> "$SRCL"
+  echo "deb-src $mirror ${suite_alias} main" >> "$SRCL"
 
   case "${SUITE_VARIANT:-}" in
     backports)
       case "${SUITE_BASE:-}" in
         squeeze)
-          echo "deb     http://backports.debian.org/debian-backports/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
-          echo "deb-src http://backports.debian.org/debian-backports/ ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb     http://backports.debian.org/debian-backports/ ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb-src http://backports.debian.org/debian-backports/ ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
           ;;
         *)
-          echo "deb     $mirror ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
-          echo "deb-src $mirror ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb     $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb-src $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
           ;;
       esac
       ;;