Merge branch 'branches/rudder/3.2'

Normation · Nov 30, 2015 · d9ab125 · d9ab125
2 parents 0cffe16 + 976a34a
commit d9ab125
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/rudder-agent/SOURCES/rudder-agent.init b/rudder-agent/SOURCES/rudder-agent.init
@@ -289,11 +289,11 @@ forcestop_daemons() {
     # If the pid file is not readable or is empty, kill all process by name
     if eval [ ! -r "\${CFENGINE_COMMUNITY_PID_FILE_$daemon}" ] || eval [ ! -s "\${CFENGINE_COMMUNITY_PID_FILE_$daemon}" ]
     then
-      # Try a killall
-      if [ -x /bin/pidof ]
+      if type pidof > /dev/null 2> /dev/null; then
       then
-        /bin/kill -KILL `eval /bin/pidof "\\\${CFENGINE_COMMUNITY_BIN_$daemon}"`
+        kill -KILL `eval pidof "\\\${CFENGINE_COMMUNITY_BIN_$daemon}"`
       else
+        # Try a killall
         eval /usr/bin/killall -KILL "\${CFENGINE_COMMUNITY_BIN_$daemon}"
       fi
 

diff --git a/rudder-inventory-ldap/SOURCES/rudder-inventory-ldap.init b/rudder-inventory-ldap/SOURCES/rudder-inventory-ldap.init
@@ -588,11 +588,11 @@ forcestop() {
     then
       message "info" "[INFO] Found no rudder-slapd process running with $SLAPD_SERVICES"
     else
-      # Try a killall
-      if [ -x /bin/pidof ]
+      if type pidof > /dev/null 2> /dev/null
       then
-        /bin/kill -KILL `/bin/pidof ${SLAPD_BIN}`
+        kill -KILL `pidof ${SLAPD_BIN}`
       else
+        # Try a killall
         /usr/bin/killall -KILL ${SLAPD_BIN}
       fi
 
@@ -628,11 +628,11 @@ forcestop() {
     then
       message "info" "[INFO] Found no slurpd process running"
     else
-      # Try a killall
-      if [ -x /bin/pidof ]
+      if type pidof > /dev/null 2> /dev/null
       then
-        /bin/kill -KILL `/bin/pidof ${SLURPD_BIN}`
+        kill -KILL `pidof ${SLURPD_BIN}`
       else
+        # Try a killall
         /usr/bin/killall -KILL ${SLURPD_BIN}
       fi