From 19f769f0497eb861eeb42961cf6f1fb395d3be58 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 12 Jun 2015 15:49:16 +1000 Subject: [PATCH] Revert "Revert "Ensure DIB_RELEASE is exported for fedora"" This reverts commit 7a4c39694864871494b677de7784fdac018c62c3. Note this time it sets it to F21, not F22, and gets rid of the duplicate definition that doesn't get exported. Change-Id: I240ad25d7a73c379559517a2a8399ae8c098314b --- elements/fedora/environment.d/10-fedora-distro-name.bash | 1 + elements/fedora/root.d/10-fedora-cloud-image | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/elements/fedora/environment.d/10-fedora-distro-name.bash b/elements/fedora/environment.d/10-fedora-distro-name.bash index 4b7684be..740bca41 100644 --- a/elements/fedora/environment.d/10-fedora-distro-name.bash +++ b/elements/fedora/environment.d/10-fedora-distro-name.bash @@ -1 +1,2 @@ export DISTRO_NAME=fedora +export DIB_RELEASE=${DIB_RELEASE:-21} diff --git a/elements/fedora/root.d/10-fedora-cloud-image b/elements/fedora/root.d/10-fedora-cloud-image index ed459cec..c89e29be 100755 --- a/elements/fedora/root.d/10-fedora-cloud-image +++ b/elements/fedora/root.d/10-fedora-cloud-image @@ -23,7 +23,7 @@ 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:-21} + # note default DIB_RELEASE set in environment setup DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.fedoraproject.org} BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-fedora-$DIB_RELEASE.$ARCH.qcow2} BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-$DIB_RELEASE.tgz