lede-packages-rs

commit 624feb24fa0c34481a42825a80e9d8453d1d024c
parent afaf425278b212bbcb6af140ca3e392a529cc0e5
Author: Ted Hess <thess@kitschensync.net>
Date:   Sun,  8 Feb 2015 11:15:07 -0500

Merge pull request #880 from chris5560/master

privoxy: modified initscript (remove killall)
Diffstat:
M
net/privoxy/Makefile
 | 
2
+-
M
net/privoxy/files/privoxy.init
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=privoxy
 PKG_VERSION:=3.0.23
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
 PKG_SOURCE_URL:=@SF/ijbswa
diff --git a/net/privoxy/files/privoxy.init b/net/privoxy/files/privoxy.init
@@ -108,11 +108,11 @@ stop() {
 	local _PID=$(cat $PIDFILE 2>/dev/null)
 	kill -15 $_PID 2>/dev/null
 	sleep 1			# give time to shutdown
-	local _tmp=$(pgrep privoxy)
+	local _tmp=$(pgrep privoxy | tr "\n" " ")
 	if [ -z "$_tmp" ]; then
 		logger -p daemon.notice -t "privoxy[$_PID]" "Shutdown successfully"
 	else
-		killall -9 privoxy
+		kill -9 $_tmp	# Normally never come here
 		logger -p daemon.warn -t "privoxy[-----]" "Shutdown forced by KILL"
 	fi
 	return 0