From a342036e753830299c4b32665bd9bc468f5d78d6 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Wed, 17 Feb 2016 22:17:11 +0000 Subject: [PATCH] Revert "Correct rhel-common for rhel6" This is breaking deployments that use registration. I believe os-refresh-config scripts don't source environment.d files, so the variable is unset there. Given that this a blocking issue for RHEL deployments, I'm pushing a quick revert and we can come up with a proper fix when this isn't stopping other work. This reverts commit 71bd8b3a3397ba1f5452286e50f6ea73816c4582. Change-Id: I87504660352220d45f5445bb933edc1c28885fcb --- .../os-refresh-config/pre-configure.d/06-rhel-registration | 4 ++-- elements/rhel-common/pre-install.d/00-rhel-registration | 4 ++-- elements/rhel/environment.d/10-rhel-distro-name.bash | 1 - elements/rhel7/environment.d/10-rhel7-distro-name.bash | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration b/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration index a4d29b37..21f386f2 100755 --- a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration +++ b/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration @@ -31,8 +31,8 @@ REG_METHOD="$(os-apply-config --key rh_registration.method --type raw --key-defa opts= attach_opts= -repos="repos --enable rhel-${RHEL_MAJ_VER}-server-rpms" -satellite_repo="rhel-${RHEL_MAJ_VER}-server-rh-common-rpms" +repos="repos --enable rhel-7-server-rpms" +satellite_repo="rhel-7-server-rh-common-rpms" if [ -n "${REG_AUTO_ATTACH:-}" ]; then opts="$opts --auto-attach" diff --git a/elements/rhel-common/pre-install.d/00-rhel-registration b/elements/rhel-common/pre-install.d/00-rhel-registration index 3f0b8450..dcb69d8f 100755 --- a/elements/rhel-common/pre-install.d/00-rhel-registration +++ b/elements/rhel-common/pre-install.d/00-rhel-registration @@ -9,8 +9,8 @@ set -o pipefail opts= attach_opts= -repos="repos --enable rhel-${RHEL_MAJ_VER}-server-rpms" -satellite_repo="rhel-${RHEL_MAJ_VER}-server-rh-common-rpms" +repos="repos --enable rhel-7-server-rpms" +satellite_repo="rhel-7-server-rh-common-rpms" if [ -n "${REG_AUTO_ATTACH:-}" ]; then opts="$opts --auto-attach" diff --git a/elements/rhel/environment.d/10-rhel-distro-name.bash b/elements/rhel/environment.d/10-rhel-distro-name.bash index 9586e6ce..cf277400 100644 --- a/elements/rhel/environment.d/10-rhel-distro-name.bash +++ b/elements/rhel/environment.d/10-rhel-distro-name.bash @@ -1,2 +1 @@ export DISTRO_NAME=rhel -export RHEL_MAJ_VER=6 diff --git a/elements/rhel7/environment.d/10-rhel7-distro-name.bash b/elements/rhel7/environment.d/10-rhel7-distro-name.bash index c8eb6080..07578d0e 100644 --- a/elements/rhel7/environment.d/10-rhel7-distro-name.bash +++ b/elements/rhel7/environment.d/10-rhel7-distro-name.bash @@ -1,2 +1 @@ export DISTRO_NAME=rhel7 -export RHEL_MAJ_VER=7