From 01510c184a251d7ed4f624a70febdf06eb473644 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 11 Apr 2022 15:36:02 -0400
Subject: [PATCH] set_os and set_cron_service_name sooner

---
 salt/common/tools/sbin/so-common | 2 +-
 salt/common/tools/sbin/soup      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index 2bfc1c0de..7b5f29c00 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -123,7 +123,7 @@ check_elastic_license() {
 check_salt_master_status() {
 	local timeout=$1
 	echo "Checking if we can talk to the salt master"
-	salt-call state.show_top -t $timeout concurrent=true
+	salt-call state.show_top concurrent=true
 
 	return
 }
diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 770c86ae8..b5c1057ad 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -1014,7 +1014,9 @@ main() {
   echo "### Preparing soup at $(date) ###"
   echo ""
 
-  if ! check_salt_master_status 30; then
+  set_os
+  set_cron_service_name
+  if ! check_salt_master_status; then
   	echo "Could not talk to salt master"
     echo "Please run `systemctl status salt-master` to ensure the salt-master service is running."
     exit 1
@@ -1055,8 +1057,6 @@ main() {
   echo "Verifying we have the latest soup script."
   verify_latest_update_script
   echo ""
-  set_os
-  set_cron_service_name
   set_palette
   check_elastic_license
   echo ""