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=8a361957e11da4672836f8e5e1da647dc06269d8;hp=1625f5afff191b3c79564f8e0676e2c64534d201;hpb=772474a7bd3531daaaa44d7f8eb450922303fc99;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 1625f5aff..c5a1a20b6 100755
--- a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
@@ -12,10 +12,12 @@ 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
 
 
@@ -29,7 +31,7 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
       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"