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

Merge "rhel-common element should not use attach with activation key"

Browse source
This commit is contained in:
Jenkins 2015-05-29 10:13:23 +00:00 committed by Gerrit Code Review
commit 8efa1fe154
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
View file

@ -116,7 +116,7 @@ case "${REG_METHOD:-}" in
portal)
echo "Registering with options: $sanitized_opts"
subscription-manager register $opts
if [ -z "${REG_AUTO_ATTACH:-}" ]; then
if [ -z "${REG_AUTO_ATTACH:-}" -a -z "${REG_ACTIVATION_KEY:-}" ]; then
echo "Attaching with options: $attach_opts"
subscription-manager attach $attach_opts
fi

2
elements/rhel-common/pre-install.d/00-rhel-registration
View file

@ -93,7 +93,7 @@ case "${REG_METHOD:-}" in
portal)
echo "Registering with options: $sanitized_opts"
subscription-manager register $opts
if [ -z "${REG_AUTO_ATTACH:-}" ]; then
if [ -z "${REG_AUTO_ATTACH:-}" -a -z "${REG_ACTIVATION_KEY:-}" ]; then
echo "Attaching with options: $attach_opts"
subscription-manager attach $attach_opts
fi