From 1675b787bfacb2b7301f0769287d6e1eecccc5d8 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 21 Jun 2023 13:27:34 -0400 Subject: [PATCH 1/2] exclude rocky-repos and remove files --- salt/repo/client/files/rocky/yum.conf.jinja | 5 +++-- salt/repo/client/map.jinja | 4 ++++ setup/so-functions | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/salt/repo/client/files/rocky/yum.conf.jinja b/salt/repo/client/files/rocky/yum.conf.jinja index bd31ac007..54ae35a41 100644 --- a/salt/repo/client/files/rocky/yum.conf.jinja +++ b/salt/repo/client/files/rocky/yum.conf.jinja @@ -12,6 +12,7 @@ installonly_limit={{ salt['pillar.get']('yum:config:installonly_limit', 2) }} bugtracker_url=http://bugs.centos.org/set_project.php?project_id=23&ref=http://bugs.centos.org/bug_report_page.php?category=yum distroverpkg=centos-release clean_requirements_on_remove=1 -{% if proxy -%} +exclude=rocky-repos +{%- if proxy %} proxy={{ proxy }} -{% endif %} +{%- endif %} diff --git a/salt/repo/client/map.jinja b/salt/repo/client/map.jinja index 1e5d9351f..515ec515b 100644 --- a/salt/repo/client/map.jinja +++ b/salt/repo/client/map.jinja @@ -11,6 +11,10 @@ 'Rocky-Sources.repo', 'Rocky-Vault.repo', 'Rocky-x86_64-kernel.repo', + 'rocky-addons.repo', + 'rocky-devel.repo', + 'rocky-extras.repo', + 'rocky.repo', 'docker-ce.repo', 'epel.repo', 'epel-testing.repo', diff --git a/setup/so-functions b/setup/so-functions index 2a69f0d36..5ecba8408 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2402,7 +2402,7 @@ update_sudoers_for_testing() { update_packages() { if [[ $is_rocky ]]; then logCmd "dnf repolist" - logCmd "dnf -y update --allowerasing --exclude=salt*,wazuh*,docker*,containerd*" + logCmd "dnf -y update --allowerasing --exclude=salt*,docker*,containerd*,rocky-repos" else info "Running apt-get update" retry 150 10 "apt-get -y update" "" "Err:" >> "$setup_log" 2>&1 || fail_setup From 4e849ecc908770660540720d3192a9e27255c361 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 21 Jun 2023 15:14:53 -0400 Subject: [PATCH 2/2] issues with exclude rocky-repos --- salt/repo/client/files/rocky/yum.conf.jinja | 1 - setup/so-functions | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/salt/repo/client/files/rocky/yum.conf.jinja b/salt/repo/client/files/rocky/yum.conf.jinja index 54ae35a41..118bffeef 100644 --- a/salt/repo/client/files/rocky/yum.conf.jinja +++ b/salt/repo/client/files/rocky/yum.conf.jinja @@ -12,7 +12,6 @@ installonly_limit={{ salt['pillar.get']('yum:config:installonly_limit', 2) }} bugtracker_url=http://bugs.centos.org/set_project.php?project_id=23&ref=http://bugs.centos.org/bug_report_page.php?category=yum distroverpkg=centos-release clean_requirements_on_remove=1 -exclude=rocky-repos {%- if proxy %} proxy={{ proxy }} {%- endif %} diff --git a/setup/so-functions b/setup/so-functions index 5ecba8408..ef4e44eaa 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2402,7 +2402,12 @@ update_sudoers_for_testing() { update_packages() { if [[ $is_rocky ]]; then logCmd "dnf repolist" - logCmd "dnf -y update --allowerasing --exclude=salt*,docker*,containerd*,rocky-repos" + logCmd "dnf -y update --allowerasing --exclude=salt*,docker*,containerd*" + RMREPOFILES=("rocky-addons.repo" "rocky-devel.repo" "rocky-extras.repo" "rocky.repo") + info "Removing repo files added by rocky-repos package update" + for FILE in ${RMREPOFILES[@]}; do + logCmd "rm -f /etc/yum.repos.d/$FILE" + done else info "Running apt-get update" retry 150 10 "apt-get -y update" "" "Err:" >> "$setup_log" 2>&1 || fail_setup