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