From 1c4abcef15ee4c8246c471ac970849eac44ef674 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Mon, 2 Nov 2020 14:25:02 -0500
Subject: [PATCH] [fix] Kill all jobs before checking if we can reach the salt
 master

---
 setup/so-functions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/so-functions b/setup/so-functions
index f2a701e7e..36886b49e 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -264,6 +264,7 @@ check_service_status() {
 
 check_salt_master_status() {
 	echo "Checking if we can talk to the salt master" >> "$setup_log" 2>&1
+	salt-call saltutil.kill_all_jobs > /dev/null 2>&1
 	salt-call state.show_top > /dev/null 2>&1
 	local status=$?
 	#true if there is an issue talking to salt master