From 8434e5afbf1f802eb9d0dd29ba69a450f8199e63 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Wed, 4 Mar 2015 23:10:04 +0000 Subject: [PATCH] Set DIB_RELEASE in ubuntu element The other distro elements set DIB_RELEASE which allows the other elements to know what distro release is being built during the extra-data or environment.d phases. Change-Id: I00bf13410ded5b678ebc66ff191891ed3cc80f4f --- elements/ubuntu/README.rst | 3 ++- elements/ubuntu/environment.d/10-ubuntu-distro-name.bash | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/elements/ubuntu/README.rst b/elements/ubuntu/README.rst index 85c7e903..199b8648 100644 --- a/elements/ubuntu/README.rst +++ b/elements/ubuntu/README.rst @@ -9,6 +9,7 @@ Overrides: * To use a non-default URL for downloading base Ubuntu cloud images, use the environment variable DIB\_CLOUD\_IMAGES * To download a non-default release of Ubuntu cloud images, use the - environment variable DIB\_RELEASE + environment variable DIB\_RELEASE. This element will export the DIB_RELEASE + variable. * To use different mirrors rather than the default of archive.ubuntu.com and security.ubuntu.com, use the environment variable DIB\_DISTRIBUTION\_MIRROR diff --git a/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash b/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash index 0fb91527..2860427c 100644 --- a/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash +++ b/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash @@ -1 +1,2 @@ export DISTRO_NAME=ubuntu +export DIB_RELEASE=${DIB_RELEASE:-trusty}