aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-09-19 14:09:27 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-09-19 14:09:27 +0000
commita5d0879de78fb3568344c4ea190cb70e3233587e (patch)
tree00250c6755d352fbe80440c65316de829654cd62
parent4815de3f265b68bd956984fb128299f00e703acf (diff)
downloadupstream-a5d0879de78fb3568344c4ea190cb70e3233587e.tar.gz
upstream-a5d0879de78fb3568344c4ea190cb70e3233587e.tar.bz2
upstream-a5d0879de78fb3568344c4ea190cb70e3233587e.zip
ppp: use service_kill()
SVN-Revision: 23088
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/ppp/files/ppp.sh10
2 files changed, 2 insertions, 10 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 8670dca132..f24ddb6d9c 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp
PKG_VERSION:=2.4.4
-PKG_RELEASE:=10
+PKG_RELEASE:=11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 46a66c969c..996d542280 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -5,15 +5,7 @@ stop_interface_ppp() {
config_get proto "$cfg" proto
local link="$proto-$cfg"
- [ -f "/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"
- }
+ service_kill pppd "/var/run/ppp-${link}.pid"
remove_dns "$cfg"