luci-mod-admin-full: prevent unknown sysctl key warnings on status page

[project/luci.git] / modules / luci-mod-admin-full / luasrc / view / admin_status / index.htm

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 18f66c2a82d326f3a88a21f5c3bc6d74dbf4f447..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,
@@ -150,7 +149,7 @@
                        return duid.substr(16).replace(/(..)(?=..)/g, '$1:').toUpperCase();
 
                // DUID-LL / Ethernet
-               if (duid.length === 24 && duid.substr(0, 8) === '00030001')
+               if (duid.length === 20 && duid.substr(0, 8) === '00030001')
                        return duid.substr(8).replace(/(..)(?=..)/g, '$1:').toUpperCase();
 
                return null;