From: Michael Prokop <mika@grml.org>
Date: Mon, 4 Feb 2013 14:56:34 +0000 (+0100)
Subject: Use http.debian.net as default mirror
X-Git-Tag: v0.55~1
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=f3a7ab6b9468d8424eb30d68df68929fffc05cf3

Use http.debian.net as default mirror

As stated at http://http.debian.net/ - the advantages of
http.debian.net over cdn.debian.net are for example:

* Mirrors whose copy is not in /debian (e.g. /pub/debian)
* Immediate effect on database changes (no DNS propagation lag)
* Lower chance of inconsistency
* Faster downloads (when APT is used, via parallel downloads)

Acked-by: Alexander Wirt <formorer@grml.org>
Acked-by: Evgeni Golov <evgeni@grml.org>
---

diff --git a/config b/config
index f1798fe..c50a300 100644
--- a/config
+++ b/config
@@ -37,7 +37,7 @@
 
 # Set mirror where packages will be downloaded from.
 # Default: use /etc/debootstrap/etc/apt/sources.list if it exists, else
-# 'http://cdn.debian.net/debian'
+# 'http://http.debian.net/debian'
 # Usage example:
 # MIRROR='ftp://ftp.de.debian.org/debian'
 
diff --git a/grml-debootstrap b/grml-debootstrap
index cbd1938..62e2c7e 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -20,7 +20,7 @@ DEBCONF='yes'
 DEBIAN_FRONTEND='noninteractive'
 DEBOOTSTRAP='debootstrap'
 EXTRAPACKAGES='yes'
-FALLBACK_MIRROR='http://cdn.debian.net/debian'
+FALLBACK_MIRROR='http://http.debian.net/debian'
 FORCE=''
 HOSTNAME='grml'
 INITRD='yes'
@@ -557,7 +557,7 @@ prompt_for_mirror()
   [ $? -eq 0 ] || bailout
 
   if [ "$CHOOSE_MIRROR" = 'net' ] ; then
-     [ -n "$MIRROR" ] || MIRROR='http://cdn.debian.net/debian'
+     [ -n "$MIRROR" ] || MIRROR='http://http.debian.net/debian'
      MIRROR="$(dialog --stdout --title "${PN}" --inputbox \
                "Please enter Debian mirror you would like to use for installing packages." \
                0 0 $MIRROR)"
diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index 5d18b90..f751cb5 100644
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -319,7 +319,7 @@ relases: lenny, squeeze, wheezy and sid. Usage example: release=sid
   mirror=...
 
 Specify mirror which should be used for apt-get/aptitude instead
-of the default one (http://cdn.debian.net/debian).
+of the default one (http://http.debian.net/debian).
 Usage example: mirror=ftp://ftp.tugraz.at/mirror/debian
 
   password=...
@@ -356,7 +356,7 @@ anymore unless you really know what you are doing. Choose Debian 6.0 (squeeze)
 or Debian 7.0 (wheezy) instead.
 
 Notice that you need to specify a mirror providing the lenny release, the
-default (http://cdn.debian.net/debian) doesn't provide it any longer nowadays.
+default (http://http.debian.net/debian) doesn't provide it any longer nowadays.
 Set the mirror to e.g. http://archive.debian.org/debian/ if you don't have
 your own lenny mirror.