openstack/diskimage-builder
Code Issues Proposed changes

Merge "Export unbound variable DIB_RHSM_USER"

Browse Source
This commit is contained in:
Jenkins 2014-05-22 17:02:19 +00:00 committed by Gerrit Code Review
commit 0f6f533993
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/rhel/finalise.d/60-rhsm-unregister
View File

@ -3,6 +3,8 @@
set -eu set -eu
set -o pipefail set -o pipefail
export DIB_RHSM_USER=${DIB_RHSM_USER:-}
if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]; then if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]; then
if [[ "$DIB_REG_TYPE" == "rhn" ]]; then if [[ "$DIB_REG_TYPE" == "rhn" ]]; then
rm -rf /etc/sysconfig/rhn/systemid rm -rf /etc/sysconfig/rhn/systemid

2
elements/rhel/pre-install.d/00-rhsm
View File

@ -3,6 +3,8 @@
set -eu set -eu
set -o pipefail set -o pipefail
export DIB_RHSM_USER=${DIB_RHSM_USER:-}
if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ] if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]
then then
opts="--force" opts="--force"