openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Move common ubuntu environment setting to ubuntu-common element"

This commit is contained in:
Zuul 2018-10-19 02:50:36 +00:00 committed by Gerrit Code Review
parent 46ec4992ff 30493f7655
commit 39c6d7c747
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash → diskimage_builder/elements/ubuntu-common/environment.d/10-ubuntu-distro-name.bash
View File

@ -1,4 +1,4 @@
export DISTRO_NAME=ubuntu
export DISTRO_NAME=${DISTRO_NAME:-ubuntu}
export DIB_RELEASE=${DIB_RELEASE:-xenial}
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,universe}

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

@ -1,2 +0,0 @@
export DISTRO_NAME=ubuntu
export DIB_RELEASE=${DIB_RELEASE:-xenial}