diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2022-07-05 23:50:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-05 23:50:06 +0200 |
| commit | 6d9e282f3a3a17a4cbd42ad7b4dbeff1816bf36a (patch) | |
| tree | 2643ddb0c43c29813a3cb7e5f76c504d53e98d5f /modules/luci-mod-status | |
| parent | 2b25474059e4fc3c4b1e5b59d9a0e440cb586cb9 (diff) | |
| parent | 88c62fe2187ebf28937cb49f880dada09937b194 (diff) | |
Merge pull request #5869 from galeksandrp/status-fix-oom-nftables
luci-mod-status: nftables.js: fix OOM on big nftables IP sets
Diffstat (limited to 'modules/luci-mod-status')
| -rw-r--r-- | modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js | 2 | ||||
| -rw-r--r-- | modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js index c5677c1ebb..3a11f1e830 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js @@ -133,7 +133,7 @@ var action_translations = { return view.extend({ load: function() { return Promise.all([ - L.resolveDefault(fs.exec_direct('/usr/sbin/nft', [ '--json', 'list', 'ruleset' ], 'json'), {}), + L.resolveDefault(fs.exec_direct('/usr/sbin/nft', [ '--terse', '--json', 'list', 'ruleset' ], 'json'), {}), L.resolveDefault(fs.exec_direct('/usr/sbin/iptables-save'), ''), L.resolveDefault(fs.exec_direct('/usr/sbin/ip6tables-save'), '') ]); diff --git a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json index f0dab25af2..18d267e801 100644 --- a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json +++ b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json @@ -71,7 +71,7 @@ "read": { "cgi-io": [ "exec" ], "file": { - "/usr/sbin/nft --json list ruleset": [ "exec" ], + "/usr/sbin/nft --terse --json list ruleset": [ "exec" ], "/usr/sbin/iptables --line-numbers -w -nvxL -t *": [ "exec" ], "/usr/sbin/ip6tables --line-numbers -w -nvxL -t *": [ "exec" ], "/usr/sbin/ip6tables": [ "list" ], |