luci-app-firewall: fix custom rules page for fw4#8405
Open
etb-source wants to merge 1 commit intoopenwrt:masterfrom
Open
luci-app-firewall: fix custom rules page for fw4#8405etb-source wants to merge 1 commit intoopenwrt:masterfrom
etb-source wants to merge 1 commit intoopenwrt:masterfrom
Conversation
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 openwrt#7428. Signed-off-by: Edwin ten Brink <git@tenbrink-bekkers.nl>
Contributor
|
This change co-opts the fw3 rules page and changes it to a fw4 rules page. What do fw3 users do? |
Author
|
This patch is not intended to remove fw3 support. It only removes the fw3-specific visibility dependency for the Custom Rules page: The concrete problem in #7428 is that this extra dependency hides the page on fw4 systems, even though fw4 is the default firewall backend on current OpenWrt releases. So the intent here is narrower:
For fw3 users, this patch does not remove the page or replace fw3-specific functionality; it only stops gating the page on a fw3-specific helper file. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes the Custom Rules page on firewall4 systems.
The page is currently hidden by a dependency on
/usr/share/fw3/helpers.conf, which is fw3-specific and not needed for firewall4.This change removes that dependency so the page is shown again on fw4,
and updates the page text to refer to nftables syntax instead of iptables.
Signed-off-by: <my@email.address>row (viagit commit --signoff)<package name>: titlefirst line subject for packagesPKG_VERSIONin the Makefile/usr/share/fw3/helpers.conf, which is fw3-specific and not needed for firewall4, so the page is shown again on fw4, and updates the page text to refer to nftables syntax instead of iptables.Closes #7428