From 95faedd878ff9e1e7a53ba313d6598587a57a2f0 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 9 Oct 2023 05:22:48 +0530 Subject: [PATCH] improve the setup where repos are enabled, post install --- includes/post/rpm-repos-enable.ksi | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/includes/post/rpm-repos-enable.ksi b/includes/post/rpm-repos-enable.ksi index 4ada692..0e25f4e 100644 --- a/includes/post/rpm-repos-enable.ksi +++ b/includes/post/rpm-repos-enable.ksi @@ -17,11 +17,8 @@ if ! dnf repolist --enabled | grep "download.rockylinux.org_pub_sig_${DNF_RELEAS dnf config-manager --set-enabled "download.rockylinux.org_pub_sig_${DNF_RELEASEVER}_altarch_${MACHINE_ARCH}_altarch-common" || exit 1 fi +# Enable EPEL if packages are installed from EPEL if dnf list installed | grep '@epel' > /dev/null || dnf list installed | grep 'epel-release' > /dev/null; then - # Install the epel-release package since we don't know if a package was - # installed from EPEL or only the epel-release package was installed. - # Either way, the user definitely wants EPEL enabled, so just do that - # anyways. dnf install --assumeyes epel-release if ! dnf repolist --enabled | grep 'crb' > /dev/null; then @@ -33,18 +30,14 @@ if dnf list installed | grep '@epel' > /dev/null || dnf list installed | grep 'e fi fi -# This is my (Pratham Patel) COPR that I use to provide 'kernel-stable-tfg' and -# 'kernel-lts-tfg' packages. I intend to keep it up-to-date so this is enabled -# so that users can get updates whenever upstream bumps versions. +# Enable my COPR for regular updates for the Stable and LTS kernels. dnf copr enable --assumeyes prathampatel/kernel-tfg "rhel-${DNF_RELEASEVER}-${MACHINE_ARCH}" if ! dnf repolist --enabled | grep 'copr:copr.fedorainfracloud.org:prathampatel:kernel-tfg' > /dev/null; then dnf config-manager --set-enabled 'copr:copr.fedorainfracloud.org:prathampatel:kernel-tfg' || exit 1 fi -if dnf list installed | grep "kernel-next-tfg\|kernel-rc-tfg\|kernel-opi5-tfg" > /dev/null; then - # The user has installed a package that provides either kernel-next or - # kernel-rc which comes from the the 'prathampatel/kernel-testing-tfg' - # COPR repository. Since that is used, enable it so updates reach the user. +# Enable my testing COPR in case the user installed something from there +if dnf list installed | grep '@COPR-kernel-testing-tfg' > /dev/null; then dnf copr enable --assumeyes prathampatel/kernel-testing-tfg "rhel-${DNF_RELEASEVER}-${MACHINE_ARCH}" if ! dnf repolist --enabled | grep 'copr:copr.fedorainfracloud.org:prathampatel:kernel-testing-tfg' > /dev/null; then dnf config-manager --set-enabled 'copr:copr.fedorainfracloud.org:prathampatel:kernel-testing-tfg' || exit 1