From 30493f7655ec326699f885ef5f70c801cb6a7d0c Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 23 Apr 2018 19:27:38 +0100 Subject: [PATCH] Move common ubuntu environment setting to ubuntu-common element 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 --- .../environment.d/10-ubuntu-distro-name.bash | 2 +- .../elements/ubuntu/environment.d/10-ubuntu-distro-name.bash | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename diskimage_builder/elements/{ubuntu-minimal => ubuntu-common}/environment.d/10-ubuntu-distro-name.bash (91%) delete mode 100644 diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash diff --git a/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash b/diskimage_builder/elements/ubuntu-common/environment.d/10-ubuntu-distro-name.bash similarity index 91% rename from diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash rename to diskimage_builder/elements/ubuntu-common/environment.d/10-ubuntu-distro-name.bash index c6154267..253127e1 100644 --- a/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash +++ b/diskimage_builder/elements/ubuntu-common/environment.d/10-ubuntu-distro-name.bash @@ -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} diff --git a/diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash b/diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash deleted file mode 100644 index fa19f207..00000000 --- a/diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash +++ /dev/null @@ -1,2 +0,0 @@ -export DISTRO_NAME=ubuntu -export DIB_RELEASE=${DIB_RELEASE:-xenial}