X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fppp%2Ffiles%2Fppp.sh;h=bfa708dadc03c45d87c4de88660d6360c615cda9;hb=760a0a87139dd90e98a0adf62a84dc2e82f14ce1;hp=339b4e73e89cbc1a96546edb3006a2f2cbc4ffc3;hpb=3226e1fe4dda33bd5eac2fb05e6de36304189ba8;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 339b4e73e8..bfa708dadc 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,9 +3,15 @@ scan_ppp() {
 	pppdev="${pppdev:-0}"
 	config_get unit "$1" unit
 	[ -z "$unit" ] && {
-		config_set "$1" ifname "ppp$pppdev"
-		config_set "$1" unit "$pppdev"
-		pppdev="$(($pppdev + 1))"
+		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"
 	}
 }
 
@@ -20,6 +26,10 @@ start_pppd() {
 		return 0
 	}
 
+	# Workaround: sometimes hotplug2 doesn't deliver the hotplug event for creating
+	# /dev/ppp fast enough to be used here
+	[ -e /dev/ppp ] || mknod /dev/ppp c 108 0
+
 	config_get device "$cfg" device
 	config_get unit "$cfg" unit
 	config_get username "$cfg" username
@@ -34,6 +44,9 @@ start_pppd() {
 
 	interval="${keepalive##*[, ]}"
 	[ "$interval" != "$keepalive" ] || interval=5
+
+	config_get_bool peerdns "$cfg" peerdns 1 
+	[ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || peerdns="" 
 	
 	config_get demand "$cfg" demand
 	[ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
@@ -44,7 +57,7 @@ start_pppd() {
 	/usr/sbin/pppd "$@" \
 		${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
 		${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
-		usepeerdns \
+		$peerdns \
 		$defaultroute \
 		${username:+user "$username" password "$password"} \
 		unit "$unit" \
@@ -64,7 +77,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 \