From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 21 Mar 2016 15:47:59 +0000 (+0100)
Subject: 99builddsourceslist: drop support for -edu
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1a8d79ec294aa9aaa97b4cf71356c0eb7a09bd40;p=mirror%2Fdsa-puppet.git

99builddsourceslist: drop support for -edu

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist
index bafff3ca9..1316be537 100755
--- a/modules/schroot/files/schroot-setup.d/99builddsourceslist
+++ b/modules/schroot/files/schroot-setup.d/99builddsourceslist
@@ -157,15 +157,6 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
                 fi
             fi
 
-        elif [ "${SUITE_VARIANT}" = 'edu' ]; then
-            SUITES="${SUITE_BASE} ${SUITE_BASE}-proposed-updates"
-            [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
-            domirror "http://ftp.debian.org/debian SUITE COMPONENT" ${APT_LIST}
-            SUITES="${SUITE_BASE} ${SUITE_BASE}-test"
-            [ -n "${edu_mirror}" ] && domirror "${edu_mirror} SUITE local" ${APT_LIST}
-            domirror "http://ftp.skolelinux.no/skolelinux/ SUITE local" ${APT_LIST}
-            APT_KEYS="${APT_KEYS} debian-edu"
-
         elif [ "${SUITE_BASE}" = 'sid' ]; then
             SUITES="unstable"
             if [ "${SUITE_VARIANT}" = "experimental" ]; then