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."