X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0bb0fd1e71a3da13f154a85d378db226f43b2932..1fc2b717c59f1ce91c385c443705aad5e77c08df:/package/ppp/files/ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 6b8ad9ca7..23fcb89ff 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -2,15 +2,27 @@ scan_ppp() {
 	config_get ifname "$1" ifname
 	pppdev="${pppdev:-0}"
 	config_get unit "$1" unit
-	[ -z "$unit" -a "${ifname%%[0-9]*}" != ppp ] && {
-		config_set "$1" ifname "ppp$pppdev"
-		config_set "$1" unit "$pppdev"
-		pppdev="$(($pppdev + 1))"
+	[ -z "$unit" ] && {
+		unit="$pppdev"
+		if [ "${ifname%%[0-9]*}" = ppp ]; then
+			unit="${ifname##ppp}"
+			[ "$pppdev" -le "$unit" ] && pppdev="$(($unit + 1))"
+		else
+			pppdev="$(($pppdev + 1))"
+		fi
+		config_set "$1" ifname "ppp$unit"
+		config_set "$1" unit "$unit"
 	}
 }
 
 start_pppd() {
 	local cfg="$1"; shift
+	local ifname
+
+	# make sure the network state references the correct ifname
+	scan_ppp "$cfg"
+	config_get ifname "$cfg" ifname
+	set_interface_ifname "$cfg" "$ifname"
 
 	# make sure only one pppd process is started
 	lock "/var/lock/ppp-${cfg}"
@@ -39,9 +51,16 @@ start_pppd() {
 	interval="${keepalive##*[, ]}"
 	[ "$interval" != "$keepalive" ] || interval=5
 
-	config_get_bool peerdns "$cfg" peerdns 1 
-	[ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || peerdns="" 
-	
+	config_get_bool peerdns "$cfg" peerdns 1
+	[ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || {
+		peerdns=""
+		config_get dns "$config" dns
+		for dns in $dns; do
+			grep -q "$dns" /tmp/resolv.conf.auto 2>/dev/null || \
+				echo "nameserver $dns" >> /tmp/resolv.conf.auto
+		done
+	}
+
 	config_get demand "$cfg" demand
 	[ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
 
@@ -71,7 +90,7 @@ setup_interface_ppp() {
 
 	config_get device "$config" device
 
-	config_get mtu "$cfg" mtu
+	config_get mtu "$config" mtu
 	mtu=${mtu:-1492}
 	start_pppd "$config" \
 		mtu $mtu mru $mtu \