X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/cd48af9071c6b72c337ee48c2454deb8f90313f7..427aee5968a0dfd2b86ba129b330d5dbcedef563:/package/ppp/files/ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 42daef922..996d54228 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -4,19 +4,10 @@ stop_interface_ppp() {
 	local proto
 	config_get proto "$cfg" proto
 
-	local ifname
-	config_get ifname "$cfg" ifname
-
-	local link="$proto-${ifname#$proto-}"
-	[ -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"
-	}
+	local link="$proto-$cfg"
+	service_kill pppd "/var/run/ppp-${link}.pid"
+
+	remove_dns "$cfg"
 
 	local lock="/var/lock/ppp-$link"
 	[ -f "$lock" ] && lock -u "$lock"
@@ -85,27 +76,20 @@ start_pppd() {
 	local peerdns
 	config_get_bool peerdns "$cfg" peerdns $peer_default
 
-	if [ "$peerdns" -eq 1 ] || [ ! -e /tmp/resolv.conf.auto ]; then
-		echo -n "" > /tmp/resolv.conf.auto
-	fi
-
 	[ "$peerdns" -eq 1 ] && {
 		peerdns="usepeerdns"
 	} || {
 		peerdns=""
-		for dns in $dns; do
-			echo "nameserver $dns" >> /tmp/resolv.conf.auto
-		done
+		add_dns "$cfg" $dns
 	}
 
 	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"
-		[ "$has_dns" -eq 0 ] && \
-			echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
+	[ "$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"
 	}