openstack/diskimage-builder
Code Issues Proposed changes

Merge "Run RHEL system unregister element earlier"

Browse Source
This commit is contained in:
Jenkins 2016-06-28 09:32:53 +00:00 committed by Gerrit Code Review
commit 14152b1657
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
elements/rhel-common/finalise.d/99-unregister → elements/rhel-common/finalise.d/60-unregister
View File

2
elements/rhel7/root.d/10-rhel7-cloud-image
View File

@ -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