openstack/diskimage-builder
Code Issues Proposed changes

Merge "Use correct Ubuntu distro url on non-x86 arches"

Browse Source
This commit is contained in:
Jenkins 2017-03-24 04:42:59 +00:00 committed by Gerrit Code Review
commit f128d08cf0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash
View File

@ -5,4 +5,13 @@ export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,restricted,universe}
if [ -n "${DIB_UBUNTU_DISTRIBUTION_MIRROR:-}" ]; then if [ -n "${DIB_UBUNTU_DISTRIBUTION_MIRROR:-}" ]; then
DIB_DISTRIBUTION_MIRROR=$DIB_UBUNTU_DISTRIBUTION_MIRROR DIB_DISTRIBUTION_MIRROR=$DIB_UBUNTU_DISTRIBUTION_MIRROR
fi fi
export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://archive.ubuntu.com/ubuntu}
# There are two default distro mirrors depending on architecture
ARCH=${ARCH:-}
if [[ "arm64 armhf powerpc ppc64el s390x" =~ "$ARCH" ]]; then
default_ubuntu_mirror=http://ports.ubuntu.com/ubuntu-ports
else
default_ubuntu_mirror=http://archive.ubuntu.com/ubuntu
fi
export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-$default_ubuntu_mirror}