update

Author: kiddin9

devices/common/diy.sh

@@ -39,7 +39,7 @@ git_clone_path separate-dhcp-dns https://github.com/Alphix/luci modules/luci-mod
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-package-manager luci-app-upnp luci-app-syscontrol luci-proto-wireguard \
-luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs luci-app-log-viewer \
+luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs \
 coremark wget-ssl curl autocore htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount resolveip ds-lite swconfig luci-app-fan luci-app-filemanager /" include/target.mk
 
 sed -i "s/procd-ujail//" include/target.mk

devices/common/patches/luci-dhcp.patch

@@ -1,6 +1,18 @@
 --- a/package/feeds/luci/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
 +++ b/package/feeds/luci/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
-@@ -442,6 +442,9 @@ return view.extend({
+@@ -253,6 +253,11 @@ return view.extend({
+ 		o.optional = true;
+ 		o.placeholder = '/example.org/ipset,ipset6';
+ 
++		o = s.taboption('general', form.Flag, 'dns_redirect',
++			_('DNS Redirect'),
++			_('Force redirect all local DNS queries to DNSMasq, a.k.a. DNS Hijacking.'));
++		o.optional = true;
++
+ 		o = s.taboption('general', form.Flag, 'allservers',
+ 			_('All servers'),
+ 			_('Query all available upstream resolvers.') + ' ' + _('First answer wins.'));
+@@ -442,6 +447,9 @@ return view.extend({
  		so.rmempty = false;
  		so.datatype = 'ipaddr("nomask")';
 
@@ -10,17 +22,3 @@
  		var ipaddrs = {};
 
  		Object.keys(hosts).forEach(function(mac) {
-
---- a/package/feeds/luci/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
-+++ b/package/feeds/luci/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
-@@ -308,6 +308,10 @@ return view.extend({
- 			_('Authoritative'),
- 			_('This is the only DHCP server in the local network.'));
- 
-+		s.taboption('general', form.Flag, 'dns_redirect',
-+			_('DNS Redirect'),
-+			_('Force redirect all local DNS queries to DNSMasq, a.k.a. DNS Hijacking.'));
-+
- 		s.taboption('general', form.Value, 'domain',
- 			_('Local domain'),
- 			_('Local domain suffix appended to DHCP names and hosts file entries.'));