X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fschroot-dsa%2Fconfig;h=41178bfd8ed48a57154e7568b188de6574302701;hb=f2610eb3cfce4a4b0ed63b80c69668c862446853;hp=688f8b6c67c1c6fee68e8b993e5a5ccdb8063a81;hpb=faae8324a9f4f9aebf94ea891a769e5b73496587;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/files/schroot-dsa/config b/modules/schroot/files/schroot-dsa/config
index 688f8b6c6..41178bfd8 100644
--- a/modules/schroot/files/schroot-dsa/config
+++ b/modules/schroot/files/schroot-dsa/config
@@ -20,14 +20,18 @@ if [ "$CHROOT_SESSION_PURGE" = "true" ]; then
     case $CHROOT_DESCRIPTION in
         "["*-*_*-dchroot"]"*)
             chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
-            suitevariant_arch_tuple="${chroot_type%%-dchroot-*}"
+            suitevariant_arch_tuple="${chroot_type%%-dchroot}"
             suitevariant=${suitevariant_arch_tuple%_*}
+            SUITE_ARCH=${suitevariant_arch_tuple##*_}
             SUITE_BASE=${suitevariant%-*}
             SUITE_VARIANT=${suitevariant##*-}
         ;;
         "["*_*-dchroot"]"*)
             chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
-            SUITE_BASE="${chroot_type%%_*}"
+            suite_arch_tuple="${chroot_type%%-dchroot}"
+            SUITE_ARCH=${suite_arch_tuple##*_}
+            SUITE_BASE="${suite_arch_tuple%%_*}"
+            SUITE_VARIANT=""
         ;;
         *)
             if [ "$STAGE" = "setup-start" ]; then
@@ -43,7 +47,7 @@ CHROOT_FILE_UNPACK_DIR=/srv/chroot/schroot-unpack
 if [ -e /etc/schroot/dsa/default-mirror ]; then
     MIRROR=$(cat /etc/schroot/dsa/default-mirror )
 fi
-MIRROR=${MIRROR:-ftp.debian.org}
+MIRROR=${MIRROR:-http://ftp.debian.org/debian/}
 
 if [ "$(basename "$0")" = "00check" ] &&
    [ "$CHROOT_TYPE" = "file" ] &&