add fixes for the pptp network scripts

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 0bb77b8284c595bf379073599ae615e6687c740f..51a19555e8bc9e400dd16fd5b6aa44efdd10cd60 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -13,15 +13,18 @@ start_pppd() {
        config_get username "$cfg" username
        config_get password "$cfg" password
        config_get keepalive "$cfg" 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 5 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 \
                replacedefaultroute \
-               ${username:+username "$username" password "$password"} \
+               ${username:+user "$username" password "$password"} \
                linkname "$cfg" \
                ipparam "$cfg"
 }