openstack/diskimage-builder
Code Issues Proposed changes

Merge "Default to http://ftp.us.debian.org/debian for debian-minimal"

Browse Source
This commit is contained in:
Jenkins 2016-10-05 12:56:07 +00:00 committed by Gerrit Code Review
commit 12a73cf204
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elements/debian-minimal/README.rst
View File

@ -11,16 +11,16 @@ There are two ways to configure apt-sources:
and security repositories is the default. In this case you can and security repositories is the default. In this case you can
overwrite the two environment variables to adapt the behavior: overwrite the two environment variables to adapt the behavior:
`DIB_DISTRIBUTION_MIRROR`: the mirror to use `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` `DIB_DEBIAN_COMPONENTS`: (default) `main`
a comma separated list of components. For Debian this can be a comma separated list of components. For Debian this can be
e.g. `main,contrib,non-free`. e.g. `main,contrib,non-free`.
Note that the default Debian series is `unstable`, and the default Note it is not recommended to use http://httpredir.debian.org/ for
mirrors for Debian can be problematic for `unstable`. Because apt `DIB_DISTRIBUTION_MIRROR` due to how unreliable it is. Be sure to
does not handle changing Packages files well across multiple out of select a mirror from the official mirror list:
sync mirrors, it is recommended that you choose a single mirror of
Debian, and pass it in via `DIB_DISTRIBUTION_MIRROR`. https://www.debian.org/mirror/list
By default only `main` component is used. If By default only `main` component is used. If
`DIB_DEBIAN_COMPONENTS` (comma separated) from the `debootstrap` `DIB_DEBIAN_COMPONENTS` (comma separated) from the `debootstrap`

2
elements/debian-minimal/environment.d/10-debian-minimal.bash
View File

@ -1,6 +1,6 @@
export DISTRO_NAME=debian export DISTRO_NAME=debian
export DIB_RELEASE=${DIB_RELEASE:-stable} 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=${DIB_DEBIAN_COMPONENTS:-main}
export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ } export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }