From 5630b353c4106928f9a7e9debc2d636fd7471243 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 2 Aug 2023 11:20:51 -0400
Subject: [PATCH 1/5] change how pgrep finds salt-master PID

---
 salt/common/packages.sls     | 2 ++
 salt/manager/tools/sbin/soup | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/salt/common/packages.sls b/salt/common/packages.sls
index 0fc067245..9cbfd08bb 100644
--- a/salt/common/packages.sls
+++ b/salt/common/packages.sls
@@ -17,6 +17,7 @@ commonpkgs:
       - netcat-openbsd
       - sqlite3
       - libssl-dev
+      - procps
       - python3-dateutil
       - python3-docker
       - python3-packaging
@@ -70,6 +71,7 @@ commonpkgs:
       - net-tools
       - nmap-ncat
       - openssl
+      - procps
       - python3-dnf-plugin-versionlock
       - python3-docker
       - python3-m2crypto
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 31f1d0fea..582e4502b 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -436,7 +436,7 @@ stop_salt_master() {
 
     echo ""
     echo "Storing salt-master pid."
-    MASTERPID=$(pgrep salt-master | head -1)
+    MASTERPID=$(pgrep -f '/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-master MainProcess')
     echo "Found salt-master PID $MASTERPID"
     systemctl_func "stop" "salt-master"
     timeout 30 tail --pid=$MASTERPID -f /dev/null || echo "salt-master still running at $(date +"%T.%6N") after waiting 30s. We cannot kill due to systemd restart option."

From 98731210003a80cac470db809f665081b963b00f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 2 Aug 2023 12:54:31 -0400
Subject: [PATCH 2/5] change pgrep for salt-minion PID

---
 salt/manager/tools/sbin/soup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 582e4502b..71f3f7a2a 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -455,7 +455,7 @@ stop_salt_minion() {
     set -e
 
     echo "Storing salt-minion pid."
-    MINIONPID=$(pgrep salt-minion | head -1)
+    MINIONPID=$(pgrep -f '/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-minion' | head -1)
     echo "Found salt-minion PID $MINIONPID"
     systemctl_func "stop" "salt-minion"
 

From f6c620455556a1edad4b0dbb398a976f591fa424 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 2 Aug 2023 13:05:24 -0400
Subject: [PATCH 3/5] procps to procps-ng

---
 salt/common/packages.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/common/packages.sls b/salt/common/packages.sls
index 9cbfd08bb..5f4a348e7 100644
--- a/salt/common/packages.sls
+++ b/salt/common/packages.sls
@@ -71,7 +71,7 @@ commonpkgs:
       - net-tools
       - nmap-ncat
       - openssl
-      - procps
+      - procps-ng
       - python3-dnf-plugin-versionlock
       - python3-docker
       - python3-m2crypto

From c17b324108a1ba353b92f6a5cd89d17c2ca18654 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 2 Aug 2023 14:04:19 -0400
Subject: [PATCH 4/5] dont count adv_ sls files for number of minions in
 deployment

---
 salt/manager/tools/sbin/soup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 71f3f7a2a..0a1c9237d 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -859,7 +859,7 @@ main() {
     set +e
 
     echo "Checking the number of minions."
-    NUM_MINIONS=$(ls /opt/so/saltstack/local/pillar/minions/*_*.sls | wc -l)
+    NUM_MINIONS=$(ls /opt/so/saltstack/local/pillar/minions/*_*.sls | grep -v adv_ | wc -l)
     if [[ $UPGRADESALT -eq 1 ]] && [[ $NUM_MINIONS -gt 1 ]]; then
       if [[ $is_airgap -eq 0 ]]; then
         echo ""

From 64776936cc4e50d21e623f874e0ba599adc12b78 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 2 Aug 2023 14:09:43 -0400
Subject: [PATCH 5/5] no longer need so-user migrate in 2.4

---
 salt/manager/tools/sbin/soup | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 0a1c9237d..1b0fb1478 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -875,9 +875,6 @@ main() {
     echo "Checking sudoers file."
     check_sudoers
 
-    echo "Checking for necessary user migrations."
-    so-user migrate
-
     systemctl_func "start" "$cron_service_name"
 
     if [[ -n $lsl_msg ]]; then