aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-10-09 07:38:25 +0000
committerSteven Barth <steven@midlink.org>2014-10-09 07:38:25 +0000
commit46e31e96bdef61d86e8b38d806d66428c0251b58 (patch)
tree15f195d42838f5f8f1179d0378b65a4a3283ff98 /package/network/services
parentca4fa0c5015ac99627b8b34f6134e90bafde2b6f (diff)
downloadupstream-46e31e96bdef61d86e8b38d806d66428c0251b58.tar.gz
upstream-46e31e96bdef61d86e8b38d806d66428c0251b58.tar.bz2
upstream-46e31e96bdef61d86e8b38d806d66428c0251b58.zip
ppp: add unconditional autoipv6-trigger
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42860 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services')
-rwxr-xr-xpackage/network/services/ppp/files/lib/netifd/ppp-up9
-rwxr-xr-xpackage/network/services/ppp/files/ppp.sh2
2 files changed, 10 insertions, 1 deletions
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