From f71d876dbb11c76b3415a058eeb923eb96302826 Mon Sep 17 00:00:00 2001 From: Edwin ten Brink Date: Sun, 8 Mar 2026 21:09:56 +0100 Subject: [PATCH] luci-app-firewall: fix custom rules page for fw4 The "Custom Rules" page is currently hidden by a dependency on /usr/share/fw3/helpers.conf, which is fw3-specific and not needed for firewall4 systems. Remove the unnecessary dependency so the page is shown again on fw4, and update the page text to refer to nftables syntax instead of iptables. This addresses #7428. Signed-off-by: Edwin ten Brink --- .../htdocs/luci-static/resources/view/firewall/custom.js | 2 +- .../root/usr/share/luci/menu.d/luci-app-firewall.json | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js index b273db470423..4b44b2f077c8 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js @@ -23,7 +23,7 @@ return view.extend({ render(fwuser) { return E([ E('h2', _('Firewall - Custom Rules')), - E('p', {}, _('Custom rules allow you to execute arbitrary iptables commands which are not otherwise covered by the firewall framework. The commands are executed after each firewall restart, right after the default ruleset has been loaded.')), + E('p', {}, _('Custom rules allow you to define custom firewall rules which are not otherwise covered by the firewall framework. On firewall4 systems, these rules must use nftables syntax.')) E('p', {}, E('textarea', { 'style': 'width:100%', 'rows': 25 }, [ fwuser != null ? fwuser : '' ])) ]); }, diff --git a/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json b/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json index f024dcfe2537..4e33c807faab 100644 --- a/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json +++ b/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json @@ -65,8 +65,5 @@ "type": "view", "path": "firewall/custom" }, - "depends": { - "fs": { "/usr/share/fw3/helpers.conf": "file" } - } } }