CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-03-02 10:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix soup failure if salt-relay isn't running

Browse Source
This commit is contained in:
Josh Patterson
2026-02-23 11:36:20 -05:00
parent b3139c5008
commit 863c7abc8b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
salt/manager/tools/sbin/soup
View File

@@ -2289,7 +2289,12 @@ main() {
(wait_for_salt_minion "$MINIONID" "120" "4" "$SOUP_LOG" || fail "Salt minion was not running or ready.") 2>&1 | tee -a "$SOUP_LOG" (wait_for_salt_minion "$MINIONID" "120" "4" "$SOUP_LOG" || fail "Salt minion was not running or ready.") 2>&1 | tee -a "$SOUP_LOG"
# Stop long-running scripts to allow potentially updated scripts to load on the next execution. # Stop long-running scripts to allow potentially updated scripts to load on the next execution.
killall salt-relay.sh if pgrep salt-relay.sh > /dev/null 2>&1; then
echo "Stopping salt-relay.sh"
killall salt-relay.sh
else
echo "salt-relay.sh is not running"
fi
# ensure the mine is updated and populated before highstates run, following the salt-master restart # ensure the mine is updated and populated before highstates run, following the salt-master restart
update_salt_mine update_salt_mine