Browse Source

Merge pull request #880 from chris5560/master

privoxy: modified initscript (remove killall)
lilik-openwrt-22.03
Ted Hess 10 years ago
parent
commit
624feb24fa
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      net/privoxy/Makefile
  2. +2
    -2
      net/privoxy/files/privoxy.init

+ 1
- 1
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


+ 2
- 2
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


Loading…
Cancel
Save