save the real configured interface name in the 'device' variable when running scan_in...

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index e6008f40c82e40f2ba143c6f99679113fb2520e2..343223af1b96e41330242a9e3471cb6dc564eab6 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,7 +1,6 @@
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"
-       config_set "$1" device "$ifname"
        config_set "$1" ifname "ppp$pppdev"
        config_set "$1" unit "$pppdev"
 }
@@ -13,13 +12,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
        /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 \