From 69cdc80723110579ef4a3ad00eda506b3c8271de Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 30 Aug 2024 13:45:13 -0700 Subject: [PATCH] Tweak crb script. Fix for RHEL rhui repos (#2308671) Signed-off-by: Troy Dawson --- crb | 4 ++-- epel-release.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/crb b/crb index 07941a2..0755840 100755 --- a/crb +++ b/crb @@ -27,7 +27,7 @@ usage() { # Show the status show_status()( # Determine if a version of CRB is enabled - crb_repo=$(dnf repolist | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt | awk '{print $1}') + crb_repo=$(dnf repolist | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt -e rhui | awk '{print $1}') if [ "${crb_repo}" == "" ] ; then echo "CRB repo is disabled" else @@ -39,7 +39,7 @@ show_status()( enable_disable_repo(){ command="$1" # Determine which repo we need to change - crb_repo=$(dnf repolist --all | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt | awk '{print $1}') + crb_repo=$(dnf repolist --all | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt -e rhui | awk '{print $1}') # Determine if we are on RHEL or not, then do the correct steps source /etc/os-release diff --git a/epel-release.spec b/epel-release.spec index aba4cfe..914bd8e 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 20%{dist} +Release: 21%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -84,6 +84,9 @@ fi %changelog +* Fri Aug 30 2024 Troy Dawson - 8-21 +- Tweak crb script. Fix for RHEL rhui repos (#2308671) + * Thu Jun 27 2024 Carl George - 8-20 - Obsolete epel-next-release subpackage for EPEL 8 Next retirement