From 442aecb9f47adbc1e792d258642997ce8c221f38 Mon Sep 17 00:00:00 2001
From: Josh Patterson <josh.patterson@securityonionsolutions.com>
Date: Tue, 22 Jul 2025 10:30:59 -0400
Subject: [PATCH] bootstrap dont start daemon, use state to start it

---
 salt/salt/map.jinja  | 4 ++--
 salt/salt/minion.sls | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja
index 55b3a7ffb..1e3b200f4 100644
--- a/salt/salt/map.jinja
+++ b/salt/salt/map.jinja
@@ -26,9 +26,9 @@
 
 {% if INSTALLEDSALTVERSION != SALTVERSION %}
   {% if grains.os_family|lower == 'redhat' %}
-      {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -s 120 -r -F stable ' ~ SALTVERSION %}
+      {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -X -r -F stable ' ~ SALTVERSION %}
   {% elif grains.os_family|lower == 'debian' %}
-    {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -s 120 -F stable ' ~ SALTVERSION %}
+    {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -X -F stable ' ~ SALTVERSION %}
   {% endif %}
 {% else %}
   {% set UPGRADECOMMAND = 'echo Already running Salt Minion version ' ~ SALTVERSION %}
diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index ba1613b82..8736f4eb2 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -44,7 +44,11 @@ install_salt_minion:
 # minion service is in failed state after upgrade. this command will start it after the state run for the upgrade completes
 start_minion_post_upgrade:
   cmd.run:
-    - name: nohup /bin/sh -c 'sleep 30; systemctl start salt-minion' &
+    - name: |
+        exec 0>&- # close stdin
+        exec 1>&- # close stdout
+        exec 2>&- # close stderr
+        nohup /bin/sh -c 'sleep 30; systemctl start salt-minion' &
     - require:
       - cmd: install_salt_minion
     - watch: