From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 2 Jul 2012 11:59:28 +0000 (+0000)
Subject: net/xl2tpd: fix ppp options keep-alive and ipv6 in xl2tpd netifd script.
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4f04a695a95fbaf685e3b0b51ac3f4853017d16e;p=openwrt%2Fsvn-archive%2Farchive.git

net/xl2tpd: fix ppp options keep-alive and ipv6 in xl2tpd netifd script.

Fix ipv6 and keepalive ppp options in netifd proto_l2tp_setup script.

SVN-Revision: 32575
---

diff --git a/net/xl2tpd/files/l2tp.sh b/net/xl2tpd/files/l2tp.sh
index c51300ad47..b0d5d4ca69 100644
--- a/net/xl2tpd/files/l2tp.sh
+++ b/net/xl2tpd/files/l2tp.sh
@@ -66,7 +66,7 @@ proto_l2tp_setup() {
 
 	mkdir -p /tmp/l2tp
 
-	echo ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} > "${optfile}"
+	echo "${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}}" > "${optfile}"
 	echo "${peerdns:+usepeerdns}" >> "${optfile}"
 	echo "$defaultroute" >> "${optfile}"
 	echo "${username:+user \"$username\" password \"$password\"}" >> "${optfile}"
@@ -78,7 +78,7 @@ proto_l2tp_setup() {
 	echo "ipv6-down-script /lib/netifd/ppp-down" >> "${optfile}"
 	# Don't wait for LCP term responses; exit immediately when killed.
 	echo "lcp-max-terminate 0" >> "${optfile}"
-	echo "${ipv6} ${pppd_options}" >> "${optfile}"
+	echo "${ipv6:++ipv6} ${pppd_options}" >> "${optfile}"
 	echo "${mtu:+mtu $mtu mru $mtu}" >> "${optfile}"
 
 	xl2tpd-control add l2tp-${config} pppoptfile=${optfile} lns=${server} redial=yes redial timeout=20