From 7dc9465ed107368c300db99ae474b0ee5c84bcb9 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 27 Sep 2016 17:25:37 -0400 Subject: [PATCH] Default to http://ftp.us.debian.org/debian for debian-minimal Since http://httpredir.debian.org is unreliable is selecting a mirror to use, we'll now default to http://ftp.us.debian.org/debian. In fact, in openstack-infra we have been overriding httpredir.debian.org for a while, now make this default in diskimage-builder. Change-Id: I48658bc076e13a0913821197e4120c73618fef8f Signed-off-by: Paul Belanger --- elements/debian-minimal/README.rst | 12 ++++++------ .../environment.d/10-debian-minimal.bash | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/elements/debian-minimal/README.rst b/elements/debian-minimal/README.rst index 04f1fbdeb..66f017218 100644 --- a/elements/debian-minimal/README.rst +++ b/elements/debian-minimal/README.rst @@ -11,16 +11,16 @@ There are two ways to configure apt-sources: and security repositories is the default. In this case you can overwrite the two environment variables to adapt the behavior: `DIB_DISTRIBUTION_MIRROR`: the mirror to use - default: http://httpredir.debian.org/debian + default: http://ftp.us.debian.org/debian `DIB_DEBIAN_COMPONENTS`: (default) `main` a comma separated list of components. For Debian this can be e.g. `main,contrib,non-free`. - Note that the default Debian series is `unstable`, and the default - mirrors for Debian can be problematic for `unstable`. Because apt - does not handle changing Packages files well across multiple out of - sync mirrors, it is recommended that you choose a single mirror of - Debian, and pass it in via `DIB_DISTRIBUTION_MIRROR`. + Note it is not recommended to use http://httpredir.debian.org/ for + `DIB_DISTRIBUTION_MIRROR` due to how unreliable it is. Be sure to + select a mirror from the official mirror list: + + https://www.debian.org/mirror/list By default only `main` component is used. If `DIB_DEBIAN_COMPONENTS` (comma separated) from the `debootstrap` diff --git a/elements/debian-minimal/environment.d/10-debian-minimal.bash b/elements/debian-minimal/environment.d/10-debian-minimal.bash index 3f2200226..13ac22fc0 100644 --- a/elements/debian-minimal/environment.d/10-debian-minimal.bash +++ b/elements/debian-minimal/environment.d/10-debian-minimal.bash @@ -1,6 +1,6 @@ export DISTRO_NAME=debian export DIB_RELEASE=${DIB_RELEASE:-stable} -export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://httpredir.debian.org/debian} +export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://ftp.us.debian.org/debian} export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main} export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }