diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-19 14:09:27 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-19 14:09:27 +0000 |
| commit | 0bff63b005cebd539d109faf3ebc1ea065597cf3 (patch) | |
| tree | 7620122eb3395abdfd9ab174bf4ae56a16896a81 | |
| parent | 177c6e6ea0f31ea4aeebbd4321ea6f76014b9f47 (diff) | |
| download | upstream-0bff63b005cebd539d109faf3ebc1ea065597cf3.tar.gz upstream-0bff63b005cebd539d109faf3ebc1ea065597cf3.tar.bz2 upstream-0bff63b005cebd539d109faf3ebc1ea065597cf3.zip | |
[package] ppp: use service_kill()
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23088 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/ppp/Makefile | 2 | ||||
| -rw-r--r-- | package/ppp/files/ppp.sh | 10 |
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" |