sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not export REG_HALT_UNREGISTER between hook scripts

Browse Source 
Do not rely on environment changes (like exporting REG_HALT_UNREGISTER)
to persist between different hooks run. This helps when the hooks are
run in different new environments every time.

Instead, in 99-unregister redo the same checks on REG_METHOD as done in
00-rhel-registration, still respecting REG_HALT_UNREGISTER in case the
user does not want to unregister the image generated.

Change-Id: Id594dcd72334f38a2fa96da21206da77a83d7a1a
Closes-Bug: #1434431
This commit is contained in:
Pino Toscano 2015-04-08 09:28:47 +02:00
parent 8111fc40aa
commit 8d19032a4a
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."