diff --git a/bin/xen-create-image b/bin/xen-create-image index c59f4b1..e9025bd 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -242,12 +242,12 @@ and EVMS EXAMPLE. --mirror=url Setup the mirror to use when installing via debootstrap. (Default value: mirror used in /etc/apt/sources.list or for Debian - "http://http.debian.net/debian/" and for Ubuntu + "http://httpredir.debian.org/debian/" and for Ubuntu "http://archive.ubuntu.com/ubuntu/") The above mentioned Debian mirror hostname automatically tries to choose a more or less close - Debian mirror. See http://http.debian.net/ for + Debian mirror. See http://httpredir.debian.org/ for details. --apt_proxy=protocol://hostname:port/ @@ -1252,10 +1252,10 @@ sub setupDefaultOptions # Initialize per distribution mirror defaults: Debian foreach my $debdist (qw(squeeze wheezy jessie sid testing oldstable stable unstable)) { - $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian'; + $CONFIG{ 'mirror_'.$debdist } = 'http://httpredir.debian.org/debian'; } foreach my $debdist (qw(sarge etch lenny)) { - $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian-archive/debian'; + $CONFIG{ 'mirror_'.$debdist } = 'http://httpredir.debian.org/debian-archive/debian'; } # Initialize per distribution mirror defaults: Ubuntu foreach my $ubuntudist (qw(lucid precise trusty utopic vivid)) { diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror index 9d2d920..5ab7b80 100755 --- a/bin/xt-guess-suite-and-mirror +++ b/bin/xt-guess-suite-and-mirror @@ -52,9 +52,9 @@ full text of the license. # Fallback to Debian or Ubuntu in case we can't find anything my $fallback = 'Debian'; -# Which mirrors to use if everything else fails (http.debian.net +# Which mirrors to use if everything else fails (httpredir.debian.org # redirects to a working mirror nearby) -my %fallback_mirror = ( Debian => 'http://http.debian.net/debian/', +my %fallback_mirror = ( Debian => 'http://httpredir.debian.org/debian/', Ubuntu => 'http://archive.ubuntu.com/ubuntu/' ); # Which suite to use if everything else fails. For Debian "stable" diff --git a/debian/changelog b/debian/changelog index e0e98c7..64e6674 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium * New upstream SNAPSHOT + Fix usage of nonexistent variable in removeDebianPackage (Closes: #774936) Thanks Lukas Schwaighofer! + + Change all occurrences of http.debian.net to httpredir.debian.org * Update Vcs-* headers as Gitorious will close its doors in June. -- Axel Beckert Fri, 09 Jan 2015 13:10:37 +0100 diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index 7afaf6c..a3e9eba 100644 --- a/etc/xen-tools.conf +++ b/etc/xen-tools.conf @@ -273,10 +273,10 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_sarge = http://archive.debian.org/debian # mirror_etch = http://archive.debian.org/debian # mirror_lenny = http://archive.debian.org/debian -# mirror_squeeze = http://http.debian.net/debian -# mirror_wheezy = http://http.debian.net/debian -# mirror_jessie = http://http.debian.net/debian -# mirror_sid = http://http.debian.net/debian +# mirror_squeeze = http://httpredir.debian.org/debian +# mirror_wheezy = http://httpredir.debian.org/debian +# mirror_jessie = http://httpredir.debian.org/debian +# mirror_sid = http://httpredir.debian.org/debian # mirror_dapper = http://old-releases.ubuntu.com/ubuntu # mirror_edgy = http://old-releases.ubuntu.com/ubuntu # mirror_feisty = http://old-releases.ubuntu.com/ubuntu