openstack/diskimage-builder
Code Issues Proposed changes

Merge "Fix for RHEL6"

Browse Source
This commit is contained in:
Jenkins 2015-01-12 16:22:18 +00:00 committed by Gerrit Code Review
commit af4b290328
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/rhel-common/README.md
View File

@ -26,6 +26,7 @@ IMPORTANT NOTE:
The 00-rhsm script is specific to RHEL6. If you use the REG_ variables to The 00-rhsm script is specific to RHEL6. If you use the REG_ variables to
use with RHEL7, you do not need to set any DIB_RHSM variables. The scripts use with RHEL7, you do not need to set any DIB_RHSM variables. The scripts
named with "rhel-registration" have not been developed or tested for RHEL6. named with "rhel-registration" have not been developed or tested for RHEL6.
For information on building RHEL6 images, please see the rhel element README.
Environment Variables For Image Creation Environment Variables For Image Creation
---------------------------------------- ----------------------------------------

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

@ -103,5 +103,5 @@ case "${REG_METHOD:-}" in
;; ;;
*) *)
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."
exit 1 exit 0
esac esac