fix ppp defaultroute issues (based on patch from #1386, fixes #1181)

[openwrt/svn-archive/archive.git] / package / ppp / files / ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 35572a0a0d8ab5ab3a41cf737670d82b13021169..5eb007da1fe367b7a67c59d15f50ef5a2fba9924 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,6 +3,10 @@ scan_ppp() {
        pppdev="${pppdev:-0}"
        config_set "$1" ifname "ppp$pppdev"
        config_set "$1" unit "$pppdev"
+       
+       # set 'auto' to 0, so that hotplug does not attempt to
+       # reconfigure an interface that is managed by pppd
+       config_set "$1" auto 0
 }
 
 start_pppd() {
@@ -10,7 +14,7 @@ start_pppd() {
 
        # make sure only one pppd process is started
        lock "/var/lock/ppp-${cfg}"
-       local pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)"
+       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
@@ -21,13 +25,13 @@ start_pppd() {
        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 \