EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ppp: use service_kill()

Browse Source 
SVN-Revision: 23088
This commit is contained in:
Jo-Philipp Wich 2010-09-19 14:09:27 +00:00
parent 4815de3f26
commit a5d0879de7
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/ppp/Makefile
View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp PKG_NAME:=ppp
PKG_VERSION:=2.4.4 PKG_VERSION:=2.4.4
PKG_RELEASE:=10 PKG_RELEASE:=11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

10
package/ppp/files/ppp.sh
View File

@ -5,15 +5,7 @@ stop_interface_ppp() {
config_get proto "$cfg" proto config_get proto "$cfg" proto
local link="$proto-$cfg" local link="$proto-$cfg"
[ -f "/var/run/ppp-${link}.pid" ] && { service_kill pppd "/var/run/ppp-${link}.pid"
local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
local try=0
grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid && \
while grep -qs pppd "/proc/$pid/cmdline" && [ $((try++)) -lt 5 ]; do sleep 1; done
grep -qs pppd "/proc/$pid/cmdline" && kill -KILL $pid && \
while grep -qs pppd "/proc/$pid/cmdline"; do sleep 1; done
rm -f "/var/run/ppp-${link}.pid"
}
remove_dns "$cfg" remove_dns "$cfg"