Merge "Run RHEL system unregister element earlier"

2016-06-28 09:32:53 +00:00 · 2016-06-28 09:32:53 +00:00 · 14152b1657
commit 14152b1657
parent 3d85df1518 87379da56a
2 changed files with 1 additions and 1 deletions
--- a/elements/rhel-common/finalise.d/60-unregister
+++ b/elements/rhel-common/finalise.d/60-unregister
--- a/elements/rhel7/root.d/10-rhel7-cloud-image
+++ b/elements/rhel7/root.d/10-rhel7-cloud-image
@ -26,7 +26,7 @@ if [ -n "$DIB_LOCAL_IMAGE" ]; then
    BASE_IMAGE_FILE=`basename $DIB_LOCAL_IMAGE`
    BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
 else
-    if [ -z "${BASE_IMAGE_FILE:-}" -o -z "${DIB_CLOUD_IMAGES}" ]; then
+    if [ -z "${BASE_IMAGE_FILE:-}" -o -z "${DIB_CLOUD_IMAGES:-}" ]; then
        echo "No source for a base image file configured."
        echo "See rhel7 element readme for details on how to obtain and use a base image."
        exit 1