From: Paul Donald <redacted>
Date: Fri, 24 Oct 2025 13:36:09 +0000 (+0200)
Subject: luci-mod-network: change && to || for DHCP tab predicates
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7e1b545bfa1d98a72d18c39528dade2b35421ed5;p=openwrt-luci.git

luci-mod-network: change && to || for DHCP tab predicates

Each prerequisite inside a { } forms an and condition.
Each {} prerequisite forms an or condition.

The tab wasn't displayed because odhcpd was not installed. The condition set
required both. Now only require one or the other to display the DHCP tab.

Closes #8033

Signed-off-by: Paul Donald <redacted>
---

diff --git a/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json b/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json
index f66cb9c1de..2a783d1a56 100644
--- a/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json
+++ b/modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json
@@ -67,7 +67,8 @@
 		},
 		"depends": {
 			"acl": [ "luci-mod-network-dhcp" ],
-			"fs": { "/usr/sbin/odhcpd": "executable", "/usr/sbin/dnsmasq": "executable" },
+			"fs": { "/usr/sbin/odhcpd": "executable" },
+			"fs": { "/usr/sbin/dnsmasq": "executable" },
 			"uci": { "dhcp": true }
 		}
 	},