From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 5 Dec 2011 16:40:25 +0000 (+0000)
Subject: luci-0.10: merge r8045
X-Git-Tag: 0.10.0~22
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=07ad0dfc376f1593a9358df4d5df2a513a2a0562;p=project%2Fluci.git

luci-0.10: merge r8045
---

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index f9b253e764..9c30f55f6c 100644
--- 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