sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct rhel-common for rhel6

Browse Source 
Hardcoding subscription-manager to use rhel-7-server-rpms causes
users building rhel6 with Satellite6 to fail. This setting cannot
be overridden with environment variables, therefore needs to be
smarter. Setting RHEL_MAJ_VER in the rhel/rhel7 environment fixes.

Change-Id: Ifbd88bc76ef8b38a739272ba6e045a12849d68df
Closes-Bug: 1404364
This commit is contained in:
Abel Lopez 2016-01-11 12:03:45 -08:00
parent beae0b21f1
commit 71bd8b3a33
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
View File

@ -31,8 +31,8 @@ REG_METHOD="$(os-apply-config --key rh_registration.method --type raw --key-defa
opts= opts=
attach_opts= attach_opts=
repos="repos --enable rhel-7-server-rpms" repos="repos --enable rhel-${RHEL_MAJ_VER}-server-rpms"
satellite_repo="rhel-7-server-rh-common-rpms" satellite_repo="rhel-${RHEL_MAJ_VER}-server-rh-common-rpms"
if [ -n "${REG_AUTO_ATTACH:-}" ]; then if [ -n "${REG_AUTO_ATTACH:-}" ]; then
opts="$opts --auto-attach" opts="$opts --auto-attach"

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

@ -9,8 +9,8 @@ set -o pipefail
opts= opts=
attach_opts= attach_opts=
repos="repos --enable rhel-7-server-rpms" repos="repos --enable rhel-${RHEL_MAJ_VER}-server-rpms"
satellite_repo="rhel-7-server-rh-common-rpms" satellite_repo="rhel-${RHEL_MAJ_VER}-server-rh-common-rpms"
if [ -n "${REG_AUTO_ATTACH:-}" ]; then if [ -n "${REG_AUTO_ATTACH:-}" ]; then
opts="$opts --auto-attach" opts="$opts --auto-attach"

1
elements/rhel/environment.d/10-rhel-distro-name.bash
View File

@ -1 +1,2 @@
export DISTRO_NAME=rhel export DISTRO_NAME=rhel
export RHEL_MAJ_VER=6

1
elements/rhel7/environment.d/10-rhel7-distro-name.bash
View File

@ -1 +1,2 @@
export DISTRO_NAME=rhel7 export DISTRO_NAME=rhel7
export RHEL_MAJ_VER=7