Switch from cdn.debian.net to http.debian.net

Let's see whether it works nowadays, we hit:

| W: Failed to fetch bzip2:/var/lib/apt/lists/partial/cdn.debian.net_debian_dists_sid_main_source_Sources  Hash Sum mismatch
| W: Failed to fetch bzip2:/var/lib/apt/lists/partial/cdn.debian.net_debian_dists_sid_main_binary-amd64_Packages  Hash Sum mismatch
| W: Failed to fetch bzip2:/var/lib/apt/lists/partial/cdn.debian.net_debian_dists_sid_main_i18n_Translation-en  Hash Sum mismatch

in today's automated builds, so it's worth a try...

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 1ece67b..f9428b5 100644 (file)
--- 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://cdn.debian.net/debian/ etch main contrib non-free
-  deb-src http://cdn.debian.net/debian/ etch main contrib non-free
+  deb     http://http.debian.net/debian/ etch main contrib non-free
+  deb-src http://http.debian.net/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 b6ced67..634207c 100644 (file)
--- 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://cdn.debian.net/debian/ lenny main contrib non-free
-  deb-src http://cdn.debian.net/debian/ lenny main contrib non-free
+  deb     http://http.debian.net/debian/ lenny main contrib non-free
+  deb-src http://http.debian.net/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 332a6e7..283fe7b 100644 (file)
--- 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://cdn.debian.net/debian/ sid main contrib non-free
-  deb-src http://cdn.debian.net/debian/ sid main contrib non-free
+  deb     http://http.debian.net/debian/ sid main contrib non-free
+  deb-src http://http.debian.net/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 c7d9f91..79fcb7c 100644 (file)
--- 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://cdn.debian.net/debian/ squeeze main contrib non-free
-  deb-src http://cdn.debian.net/debian/ squeeze main contrib non-free
+  deb     http://http.debian.net/debian/ squeeze main contrib non-free
+  deb-src http://http.debian.net/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 f88eba7..fac06c5 100644 (file)
--- 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,6 +1,6 @@
 # official debian repository (mirror selected via geo-ip):
-  deb     http://cdn.debian.net/debian/ stable main contrib non-free
-  deb-src http://cdn.debian.net/debian/ stable main contrib non-free
+  deb     http://http.debian.net/debian/ stable main contrib non-free
+  deb-src http://http.debian.net/debian/ stable main contrib non-free
 
 # security updates:
   deb     http://security.debian.org/ stable/updates main contrib

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 33dc13e..6584ee4 100644 (file)
--- 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://cdn.debian.net/debian/ testing main contrib non-free
-  deb-src http://cdn.debian.net/debian/ testing main contrib non-free
+  deb     http://http.debian.net/debian/ testing main contrib non-free
+  deb-src http://http.debian.net/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 d2d15f6..3807a95 100644 (file)
--- 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://cdn.debian.net/debian/ unstable main contrib non-free
-  deb-src http://cdn.debian.net/debian/ unstable main contrib non-free
+  deb     http://http.debian.net/debian/ unstable main contrib non-free
+  deb-src http://http.debian.net/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 d850455..90bbbbf 100644 (file)
--- 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,6 +1,6 @@
 # official debian repository (mirror selected via geo-ip):
-  deb     http://cdn.debian.net/debian/ wheezy main contrib non-free
-  deb-src http://cdn.debian.net/debian/ wheezy main contrib non-free
+  deb     http://http.debian.net/debian/ wheezy main contrib non-free
+  deb-src http://http.debian.net/debian/ wheezy main contrib non-free
 
 # security updates:
   deb     http://security.debian.org/ wheezy/updates main contrib

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 5381688..7f47acd 100644 (file)
--- 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: "<suite> <mirror>"
-# FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian"
+# FAI_DEBOOTSTRAP="squeeze http://http.debian.net/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 915a986..c010592 100644 (file)
--- 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 cdn.debian.net
+update_from http.debian.net
 
 # since this mirror is not always up to date, sync the rest from an official mirror
-# update_from cdn.debian.net
+# update_from http.debian.net
 
 # 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 cdf72bc..00ac330 100644 (file)
--- a/examples/reprepro/conf/updates
+++ b/examples/reprepro/conf/updates
@@ -1,4 +1,4 @@
 Name: debian
-Method: http://cdn.debian.net/debian/
+Method: http://http.debian.net/debian/
 # Method: http://localhost/debian/
 # Fallback: http://snapshot.debian.net/archive/2007/04/02/debian/

diff --git a/grml-live b/grml-live
index 337dcef..5ef31a1 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -628,7 +628,7 @@ fi
 
 # generate nfsroot configuration for FAI on the fly
 if [ -z "$FAI_DEBOOTSTRAP" ] ; then
-  FAI_DEBOOTSTRAP="$SUITE http://cdn.debian.net/debian"
+  FAI_DEBOOTSTRAP="$SUITE http://http.debian.net/debian"
 fi
 
 if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 12d7d46..2b6c513 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -256,12 +256,12 @@ debian2hd <options>                 ... 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://cdn.debian.net/debian
+  mirror=       specify mirror for apt-get/aptitude, e,g.: mirror=http://http.debian.net/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://cdn.debian.net/debian password=foobar
+    debian2hd target=/dev/sda1 grub=/dev/sda mirror=http://http.debian.net/debian password=foobar
 
   See http://grml.org/grml-debootstrap/ for more information.