upgrade the ixp4xx ethernet driver to v0.3.1, split the Gateway 7001 support to two...

[openwrt.git] / package / ppp / files / ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 35572a0..0bd75fc 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -10,7 +10,7 @@ start_pppd() {
 
        # make sure only one pppd process is started
        lock "/var/lock/ppp-${cfg}"
 
        # 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
        [ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
                lock -u "/var/lock/ppp-${cfg}"
                return 0


@@ -21,13 +21,13 @@ start_pppd() {
        config_get username "$cfg" username
        config_get password "$cfg" password
        config_get keepalive "$cfg" keepalive
        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
        [ "$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 "$@" \
        /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 \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
                usepeerdns \
                defaultroute \