Skip to content

Commit

Permalink
Merge pull request #11670 from Security-Onion-Solutions/fix/soupagrepo
Browse files Browse the repository at this point in the history
Fix/soupagrepo
  • Loading branch information
m0duspwnens authored Nov 1, 2023
2 parents ebf982b + 4d7b109 commit 59328d3
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions salt/manager/tools/sbin/soup
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ update_airgap_rules() {
rsync -av $UPDATE_DIR/agrules/* /nsm/repo/rules/
}

update_centos_repo() {
update_airgap_repo() {
# Update the files in the repo
echo "Syncing new updates to /nsm/repo"
rsync -av $AGREPO/* /nsm/repo/
Expand Down Expand Up @@ -821,6 +821,7 @@ main() {
set -e

if [[ $is_airgap -eq 0 ]]; then
update_airgap_repo
yum clean all
check_os_updates
elif [[ $OS == 'oracle' ]]; then
Expand Down Expand Up @@ -895,11 +896,6 @@ main() {
update_airgap_rules
fi

# Only update the repo if its airgap
if [[ $is_airgap -eq 0 && $UPGRADESALT -ne 1 ]]; then
update_centos_repo
fi

# since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars
if [[ ! "$MINIONID" =~ "_import" ]]; then
echo ""
Expand Down

0 comments on commit 59328d3

Please sign in to comment.