X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/564ea3531fda823c933161fd0dc18c7b4d26bf99..3e032c51feb1678d9fe2ff1c5570135f3da40da4:/package/ppp/files/ppp.sh?ds=inline

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 343223af1..0bd75fc0a 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -7,18 +7,27 @@ scan_ppp() {
 
 start_pppd() {
 	local cfg="$1"; shift
+
+	# make sure only one pppd process is started
+	lock "/var/lock/ppp-${cfg}"
+	local pid="$(head -n1 /var/run/ppp-${cfg}.pid 2>/dev/null)"
+	[ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
+		lock -u "/var/lock/ppp-${cfg}"
+		return 0
+	}
+
 	config_get device "$cfg" device
 	config_get unit "$cfg" unit
 	config_get username "$cfg" username
 	config_get password "$cfg" password
 	config_get keepalive "$cfg" keepalive
-	interval="${keepalive%%*[, ]}"
+	interval="${keepalive##*[, ]}"
 	[ "$interval" != "$keepalive" ] || interval=5
 	
 	config_get demand "$cfg" demand
-	[ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf
+	[ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
 	/usr/sbin/pppd "$@" \
-		${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive##[, ]*}} \
+		${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
 		${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
 		usepeerdns \
 		defaultroute \
@@ -26,4 +35,6 @@ start_pppd() {
 		${username:+user "$username" password "$password"} \
 		linkname "$cfg" \
 		ipparam "$cfg"
+
+	lock -u "/var/lock/ppp-${cfg}"
 }