[patch] Fixes stopping again!

rc-daemon.sh.diff (text/plain), 1.69 KB, created by Roy Marples (RETIRED) on 2005-10-10 05:22:21 UTC

--- rc-daemon.sh	2005-09-08 15:40:02.000000000 +0100
+++ /lib/rcscripts/sh/rc-daemon.sh	2005-10-10 13:20:38.000000000 +0100
@@ -128,7 +128,7 @@
 # via pkill
 # Returns 0 if successfuly otherwise 1
 rc_try_kill_pid() {
-	local pid="$1" signal="${2:-TERM}" session="${3:-false}"  i s
+	local pid="$1" signal="${2:-TERM}" session="${3:-false}" i s p e
 
 	# We split RC_RETRY_TIMEOUT into tenths of seconds
 	# So we return as fast as possible
@@ -137,14 +137,24 @@
 	for (( i=0; i<RC_RETRY_COUNT*10; i++ )); do
 		if ${session} ; then
 			if [[ -x /usr/bin/pkill ]]; then
-				/usr/bin/pkill "-${signal}" -s "${pid}" || return 0
+				pkill "-${signal}" -s "${pid}"
+				pgrep -s "${pid}" >/dev/null || return 0
 			else
-				local pids=$(/bin/ps -eo pid,sid | /bin/sed -n 's/'${pid}'$//p')
+				local pids=$(ps -eo pid,sid | sed -n 's/'${pid}'$//p')
 				[[ -z ${pids} ]] && return 0
-				/bin/kill -s "${signal}" ${pids} 2>/dev/null
+				kill -s "${signal}" ${pids} 2>/dev/null
+				e=false
+				for p in ${pids}; do
+					if [[ -d "/proc/${p}" ]]; then
+						e=true
+						break
+					fi
+				done
+				${e} || return 0
 			fi
 		else
-			/bin/kill -s "${signal}" "${pid}" 2>/dev/null || return 0
+			kill -s "${signal}" "${pid}" 2>/dev/null
+			[[ ! -d "/proc/${pid}" ]] && return 0
 		fi
 		LC_ALL=C /bin/sleep "${s}"
 	done
@@ -267,12 +277,12 @@
 
 	for pid in ${pids}; do
 		if [[ ${RC_FAIL_ON_ZOMBIE} == "yes" ]]; then
-			/bin/ps -p "${pid}" &>/dev/null || return 1
+			ps -p "${pid}" &>/dev/null || return 1
 		fi
 
 		if rc_kill_pid "${pid}" false ; then
 			# Remove the pidfile if the process didn't
-			[[ -f ${pidfile} ]] && /bin/rm -f "${pidfile}"
+			[[ -f ${pidfile} ]] && rm -f "${pidfile}"
 		else
 			retval=1
 		fi