Merge "Fix for RHEL6"

elements/rhel-common/README.md

@@ -26,6 +26,7 @@ IMPORTANT NOTE:
 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
 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
 ----------------------------------------

elements/rhel-common/pre-install.d/00-rhel-registration

@@ -103,5 +103,5 @@ case "${REG_METHOD:-}" in
         ;;
     *)
         echo "WARNING: only 'portal', 'satellite', and 'disable' are valid values for REG_METHOD."
-        exit 1
+        exit 0
 esac