luci-mod-network: remove unused dns_search property

The same functionality is fulfilled by the "domain" property. Two fields which
have the same semantics and purpose. None of odhcpd, dnsmasq or odhcp6c use the
dns_search property.

See also:
https://github.com/openwrt/odhcpd/issues/206

The local device might anyway use the "search" entries from /etc/resolv.conf at
the lower layers, but IPv6 RA and DHCPv6 is controlled by the "domain" property,
which is distributed to clients.

Signed-off-by: Paul Donald <[email protected]>

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 5768304e66f516d92c0e4f1156fdd1da5c589261..8b49f5a7205d8bcde083b8c0bdb03b4b0cc0bd23 100644 (file)
--- 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
@@ -1023,7 +1023,7 @@ return view.extend({
                                        so.depends({ dhcpv6: 'hybrid', master: '0' });
 
                                        so = ss.taboption('ipv6', form.DynamicList, 'domain', _('Announce 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.'));
+                                               _('Specifies a fixed list of DNS search domains to announce via DHCPv6.'));
                                        so.datatype = 'hostname';
                                        so.depends('ra', 'server');
                                        so.depends({ ra: 'hybrid', master: '0' });
@@ -1110,11 +1110,6 @@ return view.extend({
                                        o.depends('peerdns', '0');
                                o.datatype = 'ipaddr';
 
-                               o = nettools.replaceOption(s, 'advanced', form.DynamicList, 'dns_search', _('DNS search domains'));
-                               if (protoval != 'static')
-                                       o.depends('peerdns', '0');
-                               o.datatype = 'hostname';
-
                                o = nettools.replaceOption(s, 'advanced', form.Value, 'dns_metric', _('DNS weight'), _('The DNS server entries in the local resolv.conf are primarily sorted by the weight specified here'));
                                o.datatype = 'uinteger';
                                o.placeholder = '0';