From 863c7abc8b288f124ad7bc9f89e2470fc892f77b Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Mon, 23 Feb 2026 11:36:20 -0500 Subject: [PATCH] fix soup failure if salt-relay isn't running --- salt/manager/tools/sbin/soup | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 2dffd083b..e70760d5f 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -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" # 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 update_salt_mine