openstack/diskimage-builder
Code Issues Proposed changes

Merge "Do not export REG_HALT_UNREGISTER between hook scripts"

Browse Source
This commit is contained in:
Jenkins 2015-04-14 20:50:35 +00:00 committed by Gerrit Code Review
commit b0e809cbca
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elements/rhel-common/finalise.d/99-unregister
View File

@ -15,6 +15,12 @@ set -o pipefail
# debugging purposes so you can check the portal or satellite to see what was # debugging purposes so you can check the portal or satellite to see what was
# registered. Set REG_HALT_UNREGISTER to any non-null value to enable this # registered. Set REG_HALT_UNREGISTER to any non-null value to enable this
# functionality. # functionality.
if [ -z "${REG_HALT_UNREGISTER:-}" ]; then case "${REG_METHOD:-}" in
subscription-manager unregister portal | satellite)
fi if [ -z "${REG_HALT_UNREGISTER:-}" ]; then
subscription-manager unregister
fi
;;
disable)
;;
esac

1
elements/rhel-common/pre-install.d/00-rhel-registration
View File

@ -102,7 +102,6 @@ case "${REG_METHOD:-}" in
;; ;;
disable) disable)
echo "Disabling RHEL registration" echo "Disabling RHEL registration"
export REG_HALT_UNREGISTER=1 # stops attempt to unregister
;; ;;
*) *)
echo "WARNING: only 'portal', 'satellite', and 'disable' are valid values for REG_METHOD." echo "WARNING: only 'portal', 'satellite', and 'disable' are valid values for REG_METHOD."