sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move common ubuntu environment setting to ubuntu-common element

Browse Source 
The ubuntu, and ubuntu-minimal elements both make use of a common set
of environment settings to determine the distribution name.

The ubuntu-minimal element also does a few extra things which would
appear to apply to both sets and bring in extra architecture support.
As such, these are included in the common element.

This intends to be part of a series of patches which will eventually
create a new element to build a minimal ubuntu-systemd-container
element which can be used for lxc/nspawn containers.

Change-Id: Ia4e620f7d3fa6215484a8d218cea2f28bd1ffaee
This commit is contained in:
Jesse Pretorius 2018-04-23 19:27:38 +01:00 committed by Jesse Pretorius (odyssey4me)
parent b86af3dc6a
commit 30493f7655
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}