Merge "Export unbound variable DIB_RHSM_USER"

2014-05-22 17:02:19 +00:00 · 2014-05-22 17:02:19 +00:00 · 0f6f533993
commit 0f6f533993
parent 8737df75cf 8995d6402a
2 changed files with 4 additions and 0 deletions
--- a/elements/rhel/finalise.d/60-rhsm-unregister
+++ b/elements/rhel/finalise.d/60-rhsm-unregister
@ -3,6 +3,8 @@
 set -eu
 set -o pipefail

+export DIB_RHSM_USER=${DIB_RHSM_USER:-}
+
 if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]; then
    if [[ "$DIB_REG_TYPE" == "rhn" ]]; then
        rm -rf /etc/sysconfig/rhn/systemid
--- a/elements/rhel/pre-install.d/00-rhsm
+++ b/elements/rhel/pre-install.d/00-rhsm
@ -3,6 +3,8 @@
 set -eu
 set -o pipefail

+export DIB_RHSM_USER=${DIB_RHSM_USER:-}
+
 if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]
 then
    opts="--force"