From 96dd50bc39ed1093afa12ed48b327f9773243b12 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 28 Oct 2014 00:27:53 +0100 Subject: [PATCH] Switch from http.debian.net to ftp.debian.org Out of 10 recent ISO builds within ~4 days 9 of them failed. :( At least 7 of those 9 broken builds were caused by broken downloads: | 20141023 => 07:52:28 E: Failed to fetch http://http.debian.net/debian/pool/main/libr/librsvg/librsvg2-common_2.40.4-1_amd64.deb: Error reading from server. Remote end closed connection [IP: 2001:41c8:1000:21::21:35 80] | 20141024 => 06:47:25 W: Failed to fetch xz:/var/lib/apt/lists/partial/http.debian.net_debian_dists_testing_main_binary-amd64_Packages Hash Sum mismatch | 20141026 => 05:29:52 W: Failed to fetch http://http.debian.net/debian/dists/testing/main/i18n/Translation-en Hash Sum mismatch | 20141027 => E: Unable to find a source package for gcc-4.7 | 20141027 => E: Unable to find a source package for gcc-4.7 | 20141027 => 05:10:38 W: Failed to fetch xz:/var/lib/apt/lists/partial/http.debian.net_debian_dists_testing_main_binary-amd64_Packages Hash Sum mismatch | 20141027 => 09:32:37 Err http://http.debian.net/debian/ testing/main libsystemd-daemon0 amd64 215-5+b1 | 09:32:37 Error reading from server. Remote end closed connection [IP: 2001:41c8:1000:21::21:35 80] | 20141027 => 20:29:56 E: Failed to fetch http://http.debian.net/debian/pool/main/s/systemd/libsystemd-daemon0_215-5+b1_amd64.deb: Error reading from server. Remote end closed connection [IP: 2001:41c8:1000:21::21:35 80] | 20141027 => 22:44:01 E: Failed to fetch http://http.debian.net/debian/pool/main/libx/libxfont/libxfont1_1.4.99.901-1_amd64.deb: Error reading from server. Remote end closed connection [IP: 2001:41c8:1000:21::21:35 80] This is a serious development and release stopper for us. Therefore let's try switching to ftp.debian.org which has been reported to have a useful network bandwidth and failover setup available (thanks zobel + weasel). --- docs/grml-live.txt | 6 +++--- .../config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH | 4 ++-- .../config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY | 4 ++-- .../config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID | 4 ++-- .../files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE | 4 ++-- .../config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE | 8 ++++---- .../files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING | 4 ++-- .../files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE | 4 ++-- .../config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY | 8 ++++---- etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup | 3 +-- etc/grml/grml-live.conf | 2 +- examples/mkdebmirror | 4 ++-- examples/reprepro/conf/updates | 2 +- grml-live | 2 +- templates/GRML/grml-cheatcodes.txt | 4 ++-- 15 files changed, 31 insertions(+), 32 deletions(-) diff --git a/docs/grml-live.txt b/docs/grml-live.txt index de7d401..55736bb 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -541,7 +541,7 @@ Instructions # CHROOT_INSTALL="/etc/grml/fai/chroot_install" ## adjust if necessary (defaults to /grml/grml-live): ## OUTPUT="/srv/grml-live" - FAI_DEBOOTSTRAP="wheezy http://http.debian.net/debian/" + FAI_DEBOOTSTRAP="wheezy http://ftp.debian.org/debian/" # ARCH="amd64" CLASSES="GRMLBASE,GRML_FULL,AMD64" EOF @@ -654,7 +654,7 @@ How do I create a base.tgz? First of all create the chroot using debootstrap: BASECHROOT='/tmp/basefile' - debootstrap wheezy "$BASECHROOT" http://http.debian.net/debian + debootstrap wheezy "$BASECHROOT" http://ftp.debian.org/debian tar -C "$BASECHROOT" --exclude='var/cache/apt/archives/*.deb' -zcf base.tar.gz ./ [TIP] @@ -687,7 +687,7 @@ FAI_DEBOOTSTRAP: [...] APT_PROXY="http://localhost:3142/" [...] - FAI_DEBOOTSTRAP="wheezy http://localhost:3142/http.debian.net/debian wheezy main contrib non-free" + FAI_DEBOOTSTRAP="wheezy http://localhost:3142/ftp.debian.org/debian wheezy main contrib non-free" Make sure apt-cacher-ng is running ('/etc/init.d/apt-cacher-ng restart'). That's it. All downloaded files will be cached in /var/cache/apt-cacher-ng then. diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH index f9428b5..1788c87 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH @@ -1,6 +1,6 @@ # official debian repository (mirror selected via geo-ip): - deb http://http.debian.net/debian/ etch main contrib non-free - deb-src http://http.debian.net/debian/ etch main contrib non-free + deb http://ftp.debian.org/debian/ etch main contrib non-free + deb-src http://ftp.debian.org/debian/ etch main contrib non-free # official debian repository: # deb http://ftp.debian.org/debian/ etch main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY index 634207c..a76b7c6 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY @@ -1,6 +1,6 @@ # official debian repository (mirror selected via geo-ip): - deb http://http.debian.net/debian/ lenny main contrib non-free - deb-src http://http.debian.net/debian/ lenny main contrib non-free + deb http://ftp.debian.org/debian/ lenny main contrib non-free + deb-src http://ftp.debian.org/debian/ lenny main contrib non-free # security updates: deb http://security.debian.org/ lenny/updates main contrib diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID index 283fe7b..7818d1e 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID @@ -1,6 +1,6 @@ # official debian repository (mirror selected via geo-ip): - deb http://http.debian.net/debian/ sid main contrib non-free - deb-src http://http.debian.net/debian/ sid main contrib non-free + deb http://ftp.debian.org/debian/ sid main contrib non-free + deb-src http://ftp.debian.org/debian/ sid main contrib non-free # official debian repository: # deb http://ftp.debian.org/debian/ sid main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE index 79fcb7c..bca5e96 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE @@ -1,6 +1,6 @@ # official debian repository (mirror selected via geo-ip): - deb http://http.debian.net/debian/ squeeze main contrib non-free - deb-src http://http.debian.net/debian/ squeeze main contrib non-free + deb http://ftp.debian.org/debian/ squeeze main contrib non-free + deb-src http://ftp.debian.org/debian/ squeeze main contrib non-free # security updates: deb http://security.debian.org/ squeeze/updates main contrib diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE index 5bb5390..48cf414 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE @@ -1,14 +1,14 @@ # official debian repository (mirror selected via geo-ip): - deb http://http.debian.net/debian/ stable main contrib non-free - deb-src http://http.debian.net/debian/ stable main contrib non-free + deb http://ftp.debian.org/debian/ stable main contrib non-free + deb-src http://ftp.debian.org/debian/ stable main contrib non-free # security updates: deb http://security.debian.org/ stable/updates main contrib deb-src http://security.debian.org/ stable/updates main contrib # backports: - deb http://http.debian.net/debian/ wheezy-backports main - deb-src http://http.debian.net/debian/ wheezy-backports main + deb http://ftp.debian.org/debian/ wheezy-backports main + deb-src http://ftp.debian.org/debian/ wheezy-backports main # official debian repository: # deb http://ftp.debian.org/debian/ stable main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING index 6584ee4..9098384 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING @@ -1,6 +1,6 @@ # official debian repository (mirror selected via geo-ip): - deb http://http.debian.net/debian/ testing main contrib non-free - deb-src http://http.debian.net/debian/ testing main contrib non-free + deb http://ftp.debian.org/debian/ testing main contrib non-free + deb-src http://ftp.debian.org/debian/ testing main contrib non-free # security updates: deb http://security.debian.org/ testing/updates main contrib diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE index 3807a95..5ae9775 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE @@ -1,6 +1,6 @@ # official debian repository (mirror selected via geo-ip): - deb http://http.debian.net/debian/ unstable main contrib non-free - deb-src http://http.debian.net/debian/ unstable main contrib non-free + deb http://ftp.debian.org/debian/ unstable main contrib non-free + deb-src http://ftp.debian.org/debian/ unstable main contrib non-free # official debian repository: # deb http://ftp.debian.org/debian/ unstable main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY index 44fcedc..f1b5722 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY @@ -1,14 +1,14 @@ # official debian repository (mirror selected via geo-ip): - deb http://http.debian.net/debian/ wheezy main contrib non-free - deb-src http://http.debian.net/debian/ wheezy main contrib non-free + deb http://ftp.debian.org/debian/ wheezy main contrib non-free + deb-src http://ftp.debian.org/debian/ wheezy main contrib non-free # security updates: deb http://security.debian.org/ wheezy/updates main contrib deb-src http://security.debian.org/ wheezy/updates main contrib # backports: - deb http://http.debian.net/debian wheezy-backports main - deb-src http://http.debian.net/debian wheezy-backports main + deb http://ftp.debian.org/debian wheezy-backports main + deb-src http://ftp.debian.org/debian wheezy-backports main # official debian repository: # deb http://ftp.debian.org/debian/ wheezy main contrib non-free diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup index 678b42b..10f5879 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup @@ -11,9 +11,8 @@ set -e # use snapshot.debian.org based on build date for release if ifclass RELEASE ; then set -u - perl -pi -e 'BEGIN { $d="'$(date +%Y%m%d)'"; } s#^(\s+)(deb.* )(.*://http.debian.net.*?)\s+(\w+)\s+(.*)$#$1$2http://snapshot.debian.org/archive/debian/$d/ $4 $5#' \ + perl -pi -e 'BEGIN { $d="'$(date +%Y%m%d)'"; } s#^(\s+)(deb.* )(.*://ftp.debian.org.*?)\s+(\w+)\s+(.*)$#$1$2http://snapshot.debian.org/archive/debian/$d/ $4 $5#' \ "${target}/etc/apt/sources.list.d/debian.list" - fi ## END OF FILE ################################################################# diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index a26ba85..230dc86 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -66,7 +66,7 @@ # Which Debian suite and which mirror do you want to use for debootstrapping? # Usage: " " -# FAI_DEBOOTSTRAP="wheezy http://http.debian.net/debian" +# FAI_DEBOOTSTRAP="wheezy http://ftp.debian.org/debian" # Do you want to use a local mirror (like NFS)? # If so specify the directory where debian/ is available: diff --git a/examples/mkdebmirror b/examples/mkdebmirror index c010592..52cb983 100644 --- a/examples/mkdebmirror +++ b/examples/mkdebmirror @@ -30,10 +30,10 @@ allopt="$debug --ignore-missing-release --ignore-release-gpg --passive --nosourc # first sync from a mirror near to you! # please ask the mirror admin(s) for permission before downloading # several GB of data! -update_from http.debian.net +update_from ftp.debian.org # since this mirror is not always up to date, sync the rest from an official mirror -# update_from http.debian.net +# update_from ftp.debian.org # even one should not mirror the security site, but I will do it. echo "------------------ create mirror for debian-security ------------------" diff --git a/examples/reprepro/conf/updates b/examples/reprepro/conf/updates index 00ac330..682d5e6 100644 --- a/examples/reprepro/conf/updates +++ b/examples/reprepro/conf/updates @@ -1,4 +1,4 @@ Name: debian -Method: http://http.debian.net/debian/ +Method: http://ftp.debian.org/debian/ # Method: http://localhost/debian/ # Fallback: http://snapshot.debian.net/archive/2007/04/02/debian/ diff --git a/grml-live b/grml-live index 32fec43..150ada2 100755 --- a/grml-live +++ b/grml-live @@ -631,7 +631,7 @@ fi # generate nfsroot configuration for FAI on the fly if [ -z "$FAI_DEBOOTSTRAP" ] ; then - FAI_DEBOOTSTRAP="$SUITE http://http.debian.net/debian" + FAI_DEBOOTSTRAP="$SUITE http://ftp.debian.org/debian" fi if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt index 92cd354..c04753a 100644 --- a/templates/GRML/grml-cheatcodes.txt +++ b/templates/GRML/grml-cheatcodes.txt @@ -256,12 +256,12 @@ debian2hd ... whereas valid options for debian2hd are: target= target partition/directory of the new Debian system, e.g.: target=/dev/sda1 grub= where to install grub to, e.g.: grub=/dev/sda release= specify release of new Debian system (default is stable), e.g.: release=sid - mirror= specify mirror for apt-get/aptitude, e,g.: mirror=http://http.debian.net/debian + mirror= specify mirror for apt-get/aptitude, e,g.: mirror=http://ftp.debian.org/debian password= set passwort of user root without prompting for it, e.g.: password=AiTh5ahn Usage example for automatic installation: - debian2hd target=/dev/sda1 grub=/dev/sda mirror=http://http.debian.net/debian password=foobar + debian2hd target=/dev/sda1 grub=/dev/sda mirror=http://ftp.debian.org/debian password=foobar See http://grml.org/grml-debootstrap/ for more information. -- 2.1.4