From 5f98f8cac4ebf7d952d71d44f6a2791c769ab907 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 1 Dec 2021 23:18:35 +0100 Subject: [PATCH] luci-mod-network: allow IPv6 dns, dns_service and domain for RA only mode Fixes: #5564 Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/resources/view/network/interfaces.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js index 4d42fdd514..a26d51bc5e 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js @@ -882,18 +882,24 @@ return view.extend({ so = ss.taboption('ipv6', form.DynamicList, 'dns', _('Announced IPv6 DNS servers'), _('Specifies a fixed list of IPv6 DNS server addresses to announce via DHCPv6. If left unspecified, the device will announce itself as IPv6 DNS server unless the Local IPv6 DNS server option is disabled.')); so.datatype = 'ip6addr("nomask")'; /* restrict to IPv6 only for now since dnsmasq (DHCPv4) does not honour this option */ + so.depends('ra', 'server'); + so.depends({ ra: 'hybrid', master: '0' }); so.depends('dhcpv6', 'server'); so.depends({ dhcpv6: 'hybrid', master: '0' }); so = ss.taboption('ipv6', form.Flag, 'dns_service', _('Local IPv6 DNS server'), _('Announce this device as IPv6 DNS server.')); so.default = so.enabled; + so.depends({ ra: 'server', dns: /^$/ }); + so.depends({ ra: 'hybrid', dns: /^$/, master: '0' }); so.depends({ dhcpv6: 'server', dns: /^$/ }); so.depends({ dhcpv6: 'hybrid', dns: /^$/, master: '0' }); so = ss.taboption('ipv6', form.DynamicList, 'domain', _('Announced DNS domains'), _('Specifies a fixed list of DNS search domains to announce via DHCPv6. If left unspecified, the local device DNS search domain will be announced.')); so.datatype = 'hostname'; + so.depends('ra', 'server'); + so.depends({ ra: 'hybrid', master: '0' }); so.depends('dhcpv6', 'server'); so.depends({ dhcpv6: 'hybrid', master: '0' });