OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

privoxy: modified init scripts 

remove "killall" from initscript because it kills itself #867

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
This commit is contained in:
Christian Schoenebeck 2015-02-08 16:50:16 +01:00
parent afaf425278
commit abdd1593f8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/privoxy/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=privoxy PKG_NAME:=privoxy
PKG_VERSION:=3.0.23 PKG_VERSION:=3.0.23
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
PKG_SOURCE_URL:=@SF/ijbswa PKG_SOURCE_URL:=@SF/ijbswa

4
net/privoxy/files/privoxy.init
View File

@ -108,11 +108,11 @@ stop() {
local _PID=$(cat $PIDFILE 2>/dev/null) local _PID=$(cat $PIDFILE 2>/dev/null)
kill -15 $_PID 2>/dev/null kill -15 $_PID 2>/dev/null
sleep 1 # give time to shutdown sleep 1 # give time to shutdown
local _tmp=$(pgrep privoxy) local _tmp=$(pgrep privoxy | tr "\n" " ")
if [ -z "$_tmp" ]; then if [ -z "$_tmp" ]; then
logger -p daemon.notice -t "privoxy[$_PID]" "Shutdown successfully" logger -p daemon.notice -t "privoxy[$_PID]" "Shutdown successfully"
else else
killall -9 privoxy kill -9 $_tmp # Normally never come here
logger -p daemon.warn -t "privoxy[-----]" "Shutdown forced by KILL" logger -p daemon.warn -t "privoxy[-----]" "Shutdown forced by KILL"
fi fi
return 0 return 0