mirror of
https://github.com/bol-van/zapret.git
synced 2024-12-22 06:15:25 +00:00
init.d: do not use pgrep for firmwares compatibility
This commit is contained in:
parent
033043bdc0
commit
4856be4ef1
@ -167,9 +167,15 @@ run_daemon()
|
|||||||
# use $PIDDIR/$DAEMONBASE$1.pid as pidfile
|
# use $PIDDIR/$DAEMONBASE$1.pid as pidfile
|
||||||
|
|
||||||
local DAEMONBASE="$(basename "$2")"
|
local DAEMONBASE="$(basename "$2")"
|
||||||
local PIDFILE=$PIDDIR/$DAEMONBASE$1.pid
|
local PID= PIDFILE=$PIDDIR/$DAEMONBASE$1.pid
|
||||||
echo "Starting daemon $1: $2 $3"
|
echo "Starting daemon $1: $2 $3"
|
||||||
if [ -f "$PIDFILE" ] && pgrep -F "$PIDFILE" "$DAEMONBASE" >/dev/null; then
|
|
||||||
|
[ -f "$PIDFILE" ] && {
|
||||||
|
read PID <"$PIDFILE"
|
||||||
|
[ -d "/proc/$PID" ] || PID=
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ -n "$PID" ]; then
|
||||||
echo already running
|
echo already running
|
||||||
else
|
else
|
||||||
"$2" $3 >/dev/null &
|
"$2" $3 >/dev/null &
|
||||||
@ -188,18 +194,14 @@ stop_daemon()
|
|||||||
# $2 - daemon
|
# $2 - daemon
|
||||||
# use $PIDDIR/$DAEMONBASE$1.pid as pidfile
|
# use $PIDDIR/$DAEMONBASE$1.pid as pidfile
|
||||||
local DAEMONBASE="$(basename "$2")"
|
local DAEMONBASE="$(basename "$2")"
|
||||||
local PIDFILE=$PIDDIR/$DAEMONBASE$1.pid
|
local PID PIDFILE=$PIDDIR/$DAEMONBASE$1.pid
|
||||||
echo "Stopping daemon $1: $2"
|
echo "Stopping daemon $1: $2"
|
||||||
if exists start-stop-daemon ; then
|
if [ -f "$PIDFILE" ]; then
|
||||||
start-stop-daemon -K -p "$PIDFILE" -x "$2"
|
read PID <"$PIDFILE"
|
||||||
|
kill $PID
|
||||||
|
rm -f "$PIDFILE"
|
||||||
else
|
else
|
||||||
if [ -f "$PIDFILE" ]; then
|
echo no pidfile : $PIDFILE
|
||||||
read PID <"$PIDFILE"
|
|
||||||
kill $PID
|
|
||||||
rm -f "$PIDFILE"
|
|
||||||
else
|
|
||||||
echo no pidfile : $PIDFILE
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
do_daemon()
|
do_daemon()
|
||||||
|
Loading…
Reference in New Issue
Block a user