X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fppp%2Ffiles%2Fppp.sh;h=343223af1b96e41330242a9e3471cb6dc564eab6;hb=564ea3531fda823c933161fd0dc18c7b4d26bf99;hp=e6008f40c82e40f2ba143c6f99679113fb2520e2;hpb=1da81d312c0ca18ad48d3940acbe8dd169435a78;p=openwrt-10.03%2F.git diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index e6008f40c..343223af1 100644 --- 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 \