[package] ppp: use service_kill()
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 19 Sep 2010 14:09:27 +0000 (14:09 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 19 Sep 2010 14:09:27 +0000 (14:09 +0000)
SVN-Revision: 23088

package/ppp/Makefile
package/ppp/files/ppp.sh

index 8670dca..f24ddb6 100644 (file)
@@ -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/
index 46a66c9..996d542 100644 (file)
@@ -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"