From: Steven Barth <cyrus@openwrt.org>
Date: Thu, 9 Oct 2014 07:38:25 +0000 (+0000)
Subject: ppp: add unconditional autoipv6-trigger
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aad6cb99cfca296a3d5fe53f408ccd9ce55e58ea;p=openwrt%2Fstaging%2Fyousong.git

ppp: add unconditional autoipv6-trigger

SVN-Revision: 42860
---

diff --git a/package/network/services/ppp/files/lib/netifd/ppp-up b/package/network/services/ppp/files/lib/netifd/ppp-up
index fa14550ec4..f9bfe62383 100755
--- a/package/network/services/ppp/files/lib/netifd/ppp-up
+++ b/package/network/services/ppp/files/lib/netifd/ppp-up
@@ -19,3 +19,12 @@ proto_send_update "$PPP_IPPARAM"
 		[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
 	done
 }
+
+if [ -n "$AUTOIPV6" ]; then
+	json_init
+	json_add_string name "${PPP_IPPARAM}_dhcpv6"
+	json_add_string ifname "@$PPP_IPPARAM"
+	json_add_string proto "dhcpv6"
+	json_close_object
+	ubus call network add_dynamic "$(json_dump)"
+fi
diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
index eb3f069d95..0456fda5d9 100755
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/ppp/files/ppp.sh
@@ -30,7 +30,7 @@ ppp_generic_setup() {
 		ipv6=""
 	elif [ -z "$ipv6" -o "$ipv6" = auto ]; then
 		ipv6=1
-		proto_export "IPV6IFACE=${config}6"
+		proto_export "AUTOIPV6=1"
 	fi
 
 	if [ "${demand:-0}" -gt 0 ]; then