luci-0.10: merge r8045

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index f9b253e..9c30f55 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -183,6 +183,7 @@ function sysinfo()
                cpuinfo:match("model name\t+: ([^\n]+)")
 
        local model =
+               luci.util.pcdata(fs.readfile("/tmp/sysinfo/model")) or
                cpuinfo:match("machine\t+: ([^\n]+)") or
                cpuinfo:match("Hardware\t+: ([^\n]+)") or
                luci.util.pcdata(fs.readfile("/proc/diag/model")) or