diff options
| author | Peter Meiser | 2025-07-06 11:04:49 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-10-24 10:04:25 +0000 |
| commit | 87fa17a91e9a3300321833a53add8fd20258bbcb (patch) | |
| tree | 0677f6534ddd3f1c205fe211f34f6ce69deaf221 | |
| parent | d6d90566d1cd1cd6b7971064750b7ed05b8b524b (diff) | |
| download | openwrt-87fa17a91e9a3300321833a53add8fd20258bbcb.tar.gz | |
odhcp6c: change dhcpv6.sh config option "ifaceid" to "ip6ifaceid"
With this change, the interface identifier can be configured via LuCI.
Signed-off-by: Peter Meiser <peter.meiser@gmx.com>
Link: https://github.com/openwrt/openwrt/pull/19318
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index 00dd610dfa..ce530f0ef0 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -30,7 +30,7 @@ proto_dhcpv6_init_config() { proto_config_add_string iface_464xlat proto_config_add_string zone_464xlat proto_config_add_string zone - proto_config_add_string 'ifaceid:ip6addr' + proto_config_add_string 'ip6ifaceid:ip6addr' proto_config_add_string "userclass" proto_config_add_string "vendorclass" proto_config_add_array "sendopts:list(string)" @@ -56,8 +56,8 @@ proto_dhcpv6_setup() { local config="$1" local iface="$2" - local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast noclientfqdn noacceptreconfig ip6prefix ip6prefixes iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map skpriority soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff verbose - json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast noclientfqdn noacceptreconfig iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map skpriority soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff verbose + local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast noclientfqdn noacceptreconfig ip6prefix ip6prefixes iface_dslite iface_map iface_464xlat ip6ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map skpriority soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff verbose + json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast noclientfqdn noacceptreconfig iface_dslite iface_map iface_464xlat ip6ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map skpriority soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff verbose json_for_each_item proto_dhcpv6_add_prefix ip6prefix ip6prefixes # Configure @@ -84,7 +84,8 @@ proto_dhcpv6_setup() { [ "$noacceptreconfig" = "1" ] && append opts "-a" - [ -n "$ifaceid" ] && append opts "-i$ifaceid" + [ -z "$ip6ifaceid" ] && json_get_var ip6ifaceid ifaceid + [ -n "$ip6ifaceid" ] && append opts "-i$ip6ifaceid" [ -n "$vendorclass" ] && append opts "-V$vendorclass" |