summaryrefslogtreecommitdiffstats
path: root/package/network/ipv6/odhcp6c/files/dhcpv6.sh
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-07-24 14:17:41 +0000
committerSteven Barth <cyrus@openwrt.org>2014-07-24 14:17:41 +0000
commit9231df566517da7cc679b5a09832e9eb84d31ef3 (patch)
tree7fa2a14ad9ce97542dd981e945753458746f51c0 /package/network/ipv6/odhcp6c/files/dhcpv6.sh
parenta8486aeff346df74a19b8e73f137d0b3c985dd89 (diff)
downloadmaster-31e0f0ae-9231df566517da7cc679b5a09832e9eb84d31ef3.tar.gz
master-31e0f0ae-9231df566517da7cc679b5a09832e9eb84d31ef3.tar.bz2
master-31e0f0ae-9231df566517da7cc679b5a09832e9eb84d31ef3.zip
softwires: redesign dhcp(v6) provisioning
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 41823
Diffstat (limited to 'package/network/ipv6/odhcp6c/files/dhcpv6.sh')
-rwxr-xr-xpackage/network/ipv6/odhcp6c/files/dhcpv6.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index 1c6d609d43..0690bd15e5 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -19,6 +19,7 @@ proto_dhcpv6_init_config() {
proto_config_add_string zone_dslite
proto_config_add_string iface_map
proto_config_add_string zone_map
+ proto_config_add_string zone
proto_config_add_string 'ifaceid:ip6addr'
proto_config_add_string 'sourcerouting:bool'
proto_config_add_string "userclass"
@@ -31,8 +32,8 @@ proto_dhcpv6_setup() {
local config="$1"
local iface="$2"
- local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map soltimeout
- json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map soltimeout
+ local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout
+ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout
# Configure
@@ -70,6 +71,7 @@ proto_dhcpv6_setup() {
[ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0"
[ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"
[ -n "$zone_map" ] && proto_export "ZONE_MAP=$zone_map"
+ [ -n "$zone" ] && proto_export "ZONE=$zone"
proto_export "INTERFACE=$config"
proto_run_command "$config" odhcp6c \