fixing daemons_running_onedir to account for new relenv paths.

saltstack · Mar 3, 2023 · 323d029 · 323d029
1 parent 4941097
commit 323d029
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -8666,7 +8666,11 @@ daemons_running_onedir() {
         [ $fname = "master" ] && [ "$_INSTALL_MASTER" -eq $BS_FALSE ] && continue
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
-        salt_path="/opt/saltstack/salt/run/run ${fname}"
+        if [ -f "/opt/saltstack/salt/run/run" ]; then
+            salt_path="/opt/saltstack/salt/run/run ${fname}"
+        else
+            salt_path="salt-${fname}"
+        fi
         process_running=$(pgrep -f "${salt_path}")
         if [ "${process_running}" = "" ]; then
             echoerror "${salt_path} was not found running"