From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 19 Sep 2010 15:18:53 +0000 (+0000)
Subject: [backfire] merge r23088
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=0ce5e3e0bb7bb48ff8c77a22e469231abd68a3fe

[backfire] merge r23088

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23095 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 8670dca13..f24ddb6d9 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 46a66c969..996d54228 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"