X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fschroot-setup.d%2F99porterbox-extra-sources;h=c5a1a20b637156a63b39d90402c117b3ed62c246;hb=e95ac9f053c09b0ed797c8b8157cf9b3bf238250;hp=7ab9bca531adfe19573150527adced9ecbb179e7;hpb=32c7ae059e4ed67de30b0ca7eee3e16cf649040b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
index 7ab9bca53..c5a1a20b6 100755
--- a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
@@ -12,32 +12,34 @@ set -e
 . "$SETUP_DATA_DIR/common-data"
 . "$SETUP_DATA_DIR/common-functions"
 
-if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+if [ -f "${CHROOT_SCRIPT_CONFIG:-}" ]; then
     . "$CHROOT_SCRIPT_CONFIG"
-elif [ "$STATUS" = "ok" ]; then
-    fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist"
+elif [ -f "$CHROOT_PROFILE_DIR/config" ]; then
+    . "$CHROOT_PROFILE_DIR/config"
+else
+    fatal "Cannot find config script"
 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)
+    sid|jessie)
       ;;
     *)
       echo "deb     http://security.debian.org/ ${SUITE_BASE}/updates main" >> "$SRCL"
       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 +49,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
       ;;