diff --git a/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash b/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash index 26f51599..accb08c6 100644 --- a/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash +++ b/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash @@ -4,7 +4,7 @@ export DIB_RELEASE=${DIB_RELEASE:-stable} if [ -n "${DIB_DEBIAN_DISTRIBUTION_MIRROR:-}" ]; then DIB_DISTRIBUTION_MIRROR=$DIB_DEBIAN_DISTRIBUTION_MIRROR fi -export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://ftp.us.debian.org/debian} +export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://deb.debian.org/debian} export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main} export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ } diff --git a/diskimage_builder/elements/debootstrap/README.rst b/diskimage_builder/elements/debootstrap/README.rst index 5de549c2..ad69a8c1 100644 --- a/diskimage_builder/elements/debootstrap/README.rst +++ b/diskimage_builder/elements/debootstrap/README.rst @@ -14,16 +14,11 @@ There are two ways to configure apt-sources: overwrite the two environment variables to adapt the behavior: * ``DIB_DISTRIBUTION_MIRROR``: the mirror to use (default: - ``__) + ``__) * ``DIB_DEBIAN_COMPONENTS``: (default: ``main``) a comma separated list of components. For Debian this can be e.g. ``main,contrib,non-free``. - Note it is not recommended to use - ``__ for ``DIB_DISTRIBUTION_MIRROR`` - due to how unreliable it is. Be sure to select a mirror from the - official mirror list at ``__ - By default only the ``main`` component is used. If ``DIB_DEBIAN_COMPONENTS`` (comma separated) from the ``debootstrap`` element has been set, that list of components will