X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fppp%2Ffiles%2Fppp.sh;h=51a19555e8bc9e400dd16fd5b6aa44efdd10cd60;hb=89c0b40c57f9de26cf5d4e2d5167bfd294aa1e83;hp=0bb77b8284c595bf379073599ae615e6687c740f;hpb=c4f3575368c5aeef4134d82125df2814d688cc2a;p=openwrt-10.03%2F.git

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 0bb77b828..51a19555e 100644
--- 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"
 }