X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=package%2Fppp%2Ffiles%2Fppp.sh;h=996d542280cd1d8ea59ac4f55951e8ca97fceaea;hb=4f359cf47dd718276dc818763fa0e4af8d42bef3;hp=53cfb1be1aeb1a29988e502c6f1ded43364b4d93;hpb=ac5e3c8844d1a66541beaf4e8049d8d9a123aaf6;p=openwrt-10.03%2F.git

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 53cfb1be1..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"
 
@@ -92,11 +84,11 @@ start_pppd() {
 	}
 
 	local demand
-	config_get_bool demand "$cfg" demand 0
+	config_get demand "$cfg" demand 0
 
 	local demandargs
-	[ "$demand" -eq 1 ] && {
-		demandargs="precompiled-active-filter /etc/ppp/filter demand idle"
+	[ "$demand" -gt 0 ] && {
+		demandargs="precompiled-active-filter /etc/ppp/filter demand idle $demand"
 		[ "$has_dns" -eq 0 ] && add_dns "$cfg" 1.1.1.1
 	} || {
 		demandargs="persist"