X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fsys%2Fluasrc%2Fsys.lua;h=8b05d44d8d0b0a5b3da99a2609fcc9ee9440d67d;hp=722d5a381da148445a5340bb7b7a18b0d27daefb;hb=58d319ea5ffa27bb949c1b70b9d845804a3ece33;hpb=68b51e15273380e9e3531762124e535f472d90d5 diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua index 722d5a381..8b05d44d8 100644 --- a/libs/sys/luasrc/sys.lua +++ b/libs/sys/luasrc/sys.lua @@ -175,7 +175,7 @@ function sysinfo() local memcached = tonumber(meminfo:match("\nCached:%s*(%d+)")) local memfree = tonumber(meminfo:match("MemFree:%s*(%d+)")) local membuffers = tonumber(meminfo:match("Buffers:%s*(%d+)")) - local bogomips = tonumber(cpuinfo:match("BogoMIPS.-:%s*([^\n]+)")) + local bogomips = tonumber(cpuinfo:match("[Bb]ogo[Mm][Ii][Pp][Ss].-: ([^\n]+)")) or 0 local system = cpuinfo:match("system type\t+: ([^\n]+)") or @@ -185,8 +185,8 @@ function sysinfo() local model = cpuinfo:match("machine\t+: ([^\n]+)") or cpuinfo:match("Hardware\t+: ([^\n]+)") or - fs.readfile("/proc/diag/model") or - nixio.uname().machine() or + luci.util.pcdata(fs.readfile("/proc/diag/model")) or + nixio.uname().machine or system return system, model, memtotal, memcached, membuffers, memfree, bogomips