From 7b9ac7ae6d4c1a2c74e98a8d164c34d508721e54 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 19 Dec 2023 14:05:19 -0500
Subject: [PATCH] remove checkin_at_boot function

---
 salt/salt/minion.sls |  2 --
 setup/so-functions   | 10 ++--------
 setup/so-setup       |  2 --
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index 252ab9bec..10e6dc24a 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -73,8 +73,6 @@ enable_startup_states:
   file.uncomment:
     - name: /etc/salt/minion
     - regex: '^startup_states: highstate$'
-    - onlyif:
-      - cmd: "grep 'startup_states: highstate' /etc/salt/minion"
 
 # prior to 2.4.30 this managed file would restart the salt-minion service when updated
 # since this file is currently only adding a sleep timer on service start
diff --git a/setup/so-functions b/setup/so-functions
index ddc092166..8482b2e71 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -531,7 +531,8 @@ configure_minion() {
 		"  x509_v2: true"\
 		"log_level: info"\
 		"log_level_logfile: info"\
-		"log_file: /opt/so/log/salt/minion" >> "$minion_config"
+		"log_file: /opt/so/log/salt/minion"\
+		"#startup_states: highstate" >> "$minion_config"
 
 	info "Running: salt-call state.apply salt.mine_functions --local --file-root=../salt/ -l info pillar='{"host": {"mainint": "$MNIC"}}'"
 	salt-call state.apply salt.mine_functions --local --file-root=../salt/ -l info pillar="{'host': {'mainint': $MNIC}}"
@@ -542,13 +543,6 @@ configure_minion() {
 	} >> "$setup_log" 2>&1
 }
 
-checkin_at_boot() {
-	local minion_config=/etc/salt/minion
-
-	# we add this commented so that we can use salt later to uncomment it
-	echo "#startup_states: highstate" >> "$minion_config"
-}
-
 check_requirements() {
 	local req_mem
 	local req_cores
diff --git a/setup/so-setup b/setup/so-setup
index a4e67535b..9d210f00c 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -781,7 +781,6 @@ if ! [[ -f $install_opt_file ]]; then
 			title "Setting up Playbook"
 			logCmd "so-playbook-reset"
 		fi
-		checkin_at_boot
 		set_initial_firewall_access
 		logCmd "salt-call schedule.enable -linfo --local"
 		verify_setup
@@ -809,7 +808,6 @@ if ! [[ -f $install_opt_file ]]; then
 		configure_minion "$minion_type"
 		check_sos_appliance
 		drop_install_options
-		checkin_at_boot
 		logCmd "salt-call state.apply setup.highstate_cron --local --file-root=../salt/"
 		verify_setup
 	fi