odhcp6c: Add missing config option "ifaceid"

[openwrt/svn-archive/archive.git] / package / network / ipv6 / odhcp6c / files / dhcpv6.sh

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index 99867cd99dcbedb6514fa7ccbbaf4a7878dfa340..34b53c58b6b52c0f121cb114e3bd76c88fac39e1 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -9,15 +9,18 @@ proto_dhcpv6_init_config() {
        proto_config_add_string "reqprefix"
        proto_config_add_string "clientid"
        proto_config_add_string "reqopts"
-       proto_config_add_string "allow_slaaconly"
+       proto_config_add_string "noslaaconly"
+       proto_config_add_string "norelease"
+       proto_config_add_string "ip6prefix"
+       proto_config_add_string "ifaceid"
 }
 
 proto_dhcpv6_setup() {
        local config="$1"
        local iface="$2"
 
-       local reqaddress reqprefix clientid reqopts allow_slaaconly
-       json_get_vars reqaddress reqprefix clientid reqopts allow_slaaconly
+       local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid
+       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid
 
 
        # Configure
@@ -29,12 +32,18 @@ proto_dhcpv6_setup() {
 
        [ -n "$clientid" ] && append opts "-c$clientid"
 
-       [ "$allow_slaaconly" = "1" ] && append opts "-S"
+       [ "$noslaaconly" = "1" ] && append opts "-S"
+
+       [ "$norelease" = "1" ] && append opts "-k"
+
+       [ -n "$ifaceid" ] && append opts "-i$ifaceid"
 
        for opt in $reqopts; do
                append opts "-r$opt"
        done
 
+       [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
+       [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
 
        proto_export "INTERFACE=$config"
        proto_run_command "$config" odhcp6c \