git.99rst.org
/
openwrt-luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
e386d76
)
luci-mod-admin-full: prevent unknown sysctl key warnings on status page
author
Jo-Philipp Wich
<redacted>
Sun, 4 Feb 2018 18:19:44 +0000
(19:19 +0100)
committer
Jo-Philipp Wich
<redacted>
Sun, 4 Feb 2018 18:20:32 +0000
(19:20 +0100)
Signed-off-by: Jo-Philipp Wich <redacted>
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
patch
|
blob
|
history
diff --git
a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index ff5e26de94114c5c8fa068eeb8b5dbe3e7652c55..5e6e494ad6e3cd03752ab76793bc7c189cdf385c 100644
(file)
--- a/
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@
-40,10
+40,9
@@
local conn_count = tonumber(
fs.readfile("/proc/sys/net/netfilter/nf_conntrack_count") or "") or 0
- local conn_max = tonumber((
- luci.sys.exec("sysctl net.nf_conntrack_max") or
- luci.sys.exec("sysctl net.ipv4.netfilter.ip_conntrack_max") or
- ""):match("%d+")) or 4096
+ local conn_max = tonumber(luci.sys.exec(
+ "sysctl -n -e net.nf_conntrack_max net.ipv4.netfilter.ip_conntrack_max"
+ ):match("%d+")) or 4096
local rv = {
uptime = sysinfo.uptime or 0,
git clone https://git.99rst.org/PROJECT