terminalmage pushed to salt (f22). "Remove logic that kills "rogue" PIDs (..more)"

[notifications at fedoraproject.org]

>From bb27d731a0ca3d5416985d8fc5d962c6692b3b97 Mon Sep 17 00:00:00 2001
From: Erik Johnson <erik at saltstack.com>
Date: Mon, 13 Apr 2015 15:40:35 -0500
Subject: Remove logic that kills "rogue" PIDs

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1210316

diff --git a/salt-minion b/salt-minion
index 214f895..2b25c4c 100644
--- a/salt-minion
+++ b/salt-minion
@@ -68,7 +68,7 @@ start() {
             RETVAL=$?
             echo -n "already running"
         else
-            daemon --check $SERVICE $SALTMINION -d $MINION_ARGS 
+            daemon --check $SERVICE $SALTMINION -d $MINION_ARGS
         fi
     fi
     RETVAL=$?
@@ -94,16 +94,6 @@ stop() {
     else
         killproc $PROCESS
         RETVAL=$?
-        # tidy up any rogue processes:
-        PROCS=`ps -ef | grep "$SALTMINION" | grep -v grep | awk '{print $2}'`
-        if [ -n "$PROCS" ]; then
-            kill $PROCS &> /dev/null
-            sleep 1
-            PROCS=`ps -ef | grep "$SALTMINION" | grep -v grep | awk '{print $2}'`
-            if [ -n "$PROCS" ]; then
-                kill -9 $PROCS &> /dev/null
-            fi
-        fi
     fi
     echo
 }
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/salt.git/commit/?h=f22&id=bb27d731a0ca3d5416985d8fc5d962c6692b3b97