X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fschroot-setup.d%2F99builddsourceslist;h=d96f711e97eb18b08e9681f8d5dd97eb6bae4dbf;hb=11a0f9c15ed03348c1c68b154cc58bdc19b742c5;hp=506a55cb4c5a0bde6619f78f68d25cc5370f2447;hpb=6817281d2e8f2d2a0991b7517d451e6c7e38734a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist
index 506a55cb4..d96f711e9 100755
--- a/modules/schroot/files/schroot-setup.d/99builddsourceslist
+++ b/modules/schroot/files/schroot-setup.d/99builddsourceslist
@@ -142,7 +142,7 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
 
             # Temporarily add stretch-proposed-updates for stretch-security chroots as requested
             # by the security team to handle Thunderbird and Firefox ESR 60.x releases. This should
-            # be removed with the release of the 9.5 point release.
+            # be removed with the release of the 9.12 point release.
             if [ ${SUITE_BASE} = "stretch" ] ; then
                 SUITES="${SUITE_BASE}-proposed-updates"
                 [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
@@ -150,12 +150,7 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
             fi
 
         elif [ "${SUITE_VARIANT%%-sloppy}" = 'backports' ]; then
-            # Hack: for kfreebsd-* the base suite for jessie-backports and jessie-backports-sloppy is jessie-kfreebsd (and not jessie)
-            if echo "${CHROOT_ALIAS}" | grep -q 'kfreebsd-\w\+-sbuild$' ; then
-                SUITES="${SUITE_BASE}-kfreebsd"
-            else
-                SUITES="${SUITE_BASE}"
-            fi
+            SUITES="${SUITE_BASE}"
             [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
             domirror "http://ftp.debian.org/debian SUITE COMPONENT" ${APT_LIST}
             SUITES="${SUITE_BASE}"