diff --git a/package/lean/autocore/files/arm/index.htm b/package/lean/autocore/files/arm/index.htm index 20eb2f46a6..76a3a078b7 100644 --- a/package/lean/autocore/files/arm/index.htm +++ b/package/lean/autocore/files/arm/index.htm @@ -45,15 +45,16 @@ 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 user_info = luci.sys.exec("cat /proc/net/arp | grep 'br-lan' | grep '0x2' | wc -l") - + local cpu_usage = (luci.sys.exec("expr 100 - $(top -n 1 | grep 'CPU:' | awk -F '%' '{print$4}' | awk -F ' ' '{print$2}')") or "6") .. "%" + local cpu_info = luci.sys.exec("/sbin/cpuinfo") or "ARM Processor x 0 (233MHz, 2.3°C)" local rv = { + cpuinfo = cpu_info, cpuusage = cpu_usage, userinfo = user_info, - systemp = sys_temp, uptime = sysinfo.uptime or 0, localtime = os.date(), loadavg = sysinfo.load or { 0, 0, 0 }, @@ -645,6 +646,9 @@ if (e = document.getElementById('cpuusage')) e.innerHTML = info.cpuusage; + if (e = document.getElementById('cpuinfo')) + e.innerHTML = info.cpuinfo; + if (e = document.getElementById('loadavg')) e.innerHTML = String.format( '%.02f, %.02f, %.02f', @@ -692,7 +696,7 @@ - +
<%:Hostname%><%=luci.sys.hostname() or "?"%>
<%:Model%><%=pcdata(boardinfo.model or "?")%> <%=luci.sys.exec("cat /etc/bench.log") or ""%>
<%:Architecture%><%=pcdata(boardinfo.system or "ARMv8 Processor")%> x <%=luci.sys.exec("cat /proc/cpuinfo | grep 'processor' | wc -l") or "1"%> <%=luci.sys.exec("cpuinfo") or ""%>
<%:Architecture%>-
<%:Firmware Version%> <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> diff --git a/package/lean/autocore/files/arm/sbin/cpuinfo b/package/lean/autocore/files/arm/sbin/cpuinfo index 5fad394622..ff2691ecc2 100755 --- a/package/lean/autocore/files/arm/sbin/cpuinfo +++ b/package/lean/autocore/files/arm/sbin/cpuinfo @@ -1,6 +1,10 @@ #!/bin/sh -cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq) / 1000)Mhz" +cpu_arch="$(cat "/proc/cpuinfo" | grep "model name" | sed -n "1p" | awk -F ': ' '{print $2}')" +[ -z "${cpu_arch}" ] && cpu_arch="ARMv8 Processor" +cpu_cores="$(cat "/proc/cpuinfo" | grep "processor" | wc -l)" + +cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq) / 1000)MHz" sys_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C" -echo -n "(${cpu_freq}, ${sys_temp})" +echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq}, ${sys_temp})"