From faae8324a9f4f9aebf94ea891a769e5b73496587 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 28 Jan 2015 18:30:31 +0100 Subject: [PATCH] Get rid of always broken http.d.net --- modules/schroot/files/schroot-dsa/config | 2 +- modules/schroot/files/schroot-setup.d/99porterbox-extra-sources | 2 +- modules/schroot/files/setup-dchroot | 2 +- modules/schroot/templates/default-mirror.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/schroot/files/schroot-dsa/config b/modules/schroot/files/schroot-dsa/config index d2cc3686..688f8b6c 100644 --- a/modules/schroot/files/schroot-dsa/config +++ b/modules/schroot/files/schroot-dsa/config @@ -43,7 +43,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:-http.debian.net} +MIRROR=${MIRROR:-ftp.debian.org} if [ "$(basename "$0")" = "00check" ] && [ "$CHROOT_TYPE" = "file" ] && diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources index a65532e0..08dab86f 100755 --- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources +++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources @@ -26,7 +26,7 @@ fi if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list" rm -f "$SRCL" - mirror=${MIRROR:-http://http.debian.net/debian} + mirror=${MIRROR:-http://ftp.debian.org/debian} case "${SUITE_BASE:-}" in experimental) diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot index 998ad414..24a1857a 100755 --- a/modules/schroot/files/setup-dchroot +++ b/modules/schroot/files/setup-dchroot @@ -150,7 +150,7 @@ arch="$THISARCH" if [ -e /etc/schroot/dsa/default-mirror ]; then mirror=$(cat /etc/schroot/dsa/default-mirror ) fi -mirror="${mirror:-http://http.debian.net/debian}" +mirror="${mirror:-http://ftp.debian.org/debian}" configonly="" force="" basedir="/srv/chroot" diff --git a/modules/schroot/templates/default-mirror.erb b/modules/schroot/templates/default-mirror.erb index 0208890b..48d680f0 100644 --- a/modules/schroot/templates/default-mirror.erb +++ b/modules/schroot/templates/default-mirror.erb @@ -3,6 +3,6 @@ ninfo = scope.lookupvar('site::nodeinfo') if ninfo['hoster'].has_key?('mirror-debian') then ninfo['hoster']['mirror-debian'] else - 'http://http.debian.net/debian' + 'http://ftp.debian.org/debian' end %> -- 2.39.5