From 8d19032a4a7a3615547ca295c34b4c2d79cb8b39 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 8 Apr 2015 09:28:47 +0200
Subject: [PATCH] Do not export REG_HALT_UNREGISTER between hook scripts

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
---
 elements/rhel-common/finalise.d/99-unregister        | 12 +++++++++---
 .../rhel-common/pre-install.d/00-rhel-registration   |  1 -
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/elements/rhel-common/finalise.d/99-unregister b/elements/rhel-common/finalise.d/99-unregister
index 7c56fc3f..fbf247f7 100755
--- a/elements/rhel-common/finalise.d/99-unregister
+++ b/elements/rhel-common/finalise.d/99-unregister
@@ -15,6 +15,12 @@ set -o pipefail
 # 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
 # functionality.
-if [ -z "${REG_HALT_UNREGISTER:-}" ]; then
-    subscription-manager unregister
-fi
+case "${REG_METHOD:-}" in
+    portal | satellite)
+        if [ -z "${REG_HALT_UNREGISTER:-}" ]; then
+            subscription-manager unregister
+        fi
+        ;;
+    disable)
+        ;;
+esac
diff --git a/elements/rhel-common/pre-install.d/00-rhel-registration b/elements/rhel-common/pre-install.d/00-rhel-registration
index a5ed2d51..7b04a791 100755
--- a/elements/rhel-common/pre-install.d/00-rhel-registration
+++ b/elements/rhel-common/pre-install.d/00-rhel-registration
@@ -102,7 +102,6 @@ case "${REG_METHOD:-}" in
         ;;
     disable)
         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."