From 28d32f1b5f95b680ebd16688e9dbdbe27d0d620c Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Fri, 1 May 2015 17:43:33 +0000 Subject: [PATCH] Export DIB_RELEASE in centos We export this variable by convention in the other OS elements. Change-Id: I311a54ff614596fe7ee23bf44b44b55f9d04690d --- elements/centos/environment.d/10-centos6-distro-name.bash | 1 + elements/centos/root.d/10-centos6-cloud-image | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/elements/centos/environment.d/10-centos6-distro-name.bash b/elements/centos/environment.d/10-centos6-distro-name.bash index 88d6a81f..633b7e84 100644 --- a/elements/centos/environment.d/10-centos6-distro-name.bash +++ b/elements/centos/environment.d/10-centos6-distro-name.bash @@ -1 +1,2 @@ export DISTRO_NAME=centos +export DIB_RELEASE=${DIB_RELEASE:-GenericCloud-20141129_01} diff --git a/elements/centos/root.d/10-centos6-cloud-image b/elements/centos/root.d/10-centos6-cloud-image index 85f4d1d4..e6e1d67e 100755 --- a/elements/centos/root.d/10-centos6-cloud-image +++ b/elements/centos/root.d/10-centos6-cloud-image @@ -23,7 +23,6 @@ if [ -n "$DIB_LOCAL_IMAGE" ]; then BASE_IMAGE_FILE=$(basename $DIB_LOCAL_IMAGE) BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz else - DIB_RELEASE=${DIB_RELEASE:-GenericCloud-20141129_01} DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.centos.org/centos/6/images} BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-CentOS-6-x86_64-$DIB_RELEASE.qcow2} BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz