Use http.debian.net as default Debian mirror if no mirror is given

... i.e. if even xt-guess-suite-and-mirror is not used.

diff --git a/bin/xen-create-image b/bin/xen-create-image
index f3e40cd2f66bae45eac3bbf4de34f8164ddb6386..6ec46058729d516006f18bd946fb73c4b8143c9f 100755 (executable)
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -1323,7 +1323,7 @@ sub setupDefaultOptions
 
     # Initialize per distribution mirror defaults: Debian
     foreach my $debdist (qw(squeeze wheezy jessie sid testing oldstable stable unstable)) {
-        $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
+        $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian';
     }
     foreach my $debdist (qw(sarge etch lenny)) {
         $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian-archive/debian';

diff --git a/debian/changelog b/debian/changelog
index 136c4cb3bd4f4f8d95f8e5e42944e62de6850200..bb7db7b4176c58cb422fd756024b21ffad9f315d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
 
   * New upstream release
     - Code deduplication to unify the xen-*-image scripts
+    - Use http.debian.net as default Debian mirror if no mirror is given
+      and xt-guess-suite-and-mirror is not used.
     - Fix symbolic link hooks/centos-6/15-setup-arch (Closes: #690299)
     - Execute END block not on --version/--help/--manual (Closes: #684346)
     - Move code for --boot feature to END block. Fixes missing SSH