Merge "Correct rhel-common for rhel6"
This commit is contained in:
commit
1cd7ca70d8
@ -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"
|
||||||
|
|
||||||
|
@ -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 +1,2 @@
|
|||||||
export DISTRO_NAME=rhel
|
export DISTRO_NAME=rhel
|
||||||
|
export RHEL_MAJ_VER=6
|
||||||
|
@ -1 +1,2 @@
|
|||||||
export DISTRO_NAME=rhel7
|
export DISTRO_NAME=rhel7
|
||||||
|
export RHEL_MAJ_VER=7
|
||||||
|
Loading…
Reference in New Issue
Block a user