luci-0.10: merge r6702

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index f3c5a0143018e1645556f252272a2d23c618be2c..7851f05ada7e6e81f502f193f8395392f9314cea 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -38,6 +38,9 @@ local uptime = luci.sys.uptime()
 s:option(DummyValue, "_system", translate("System")).value = system
 s:option(DummyValue, "_cpu", translate("Processor")).value = model
 
+s:option(DummyValue, "_kernel", translate("Kernel")).value =
+ luci.util.exec("uname -r") or "?"
+
 local load1, load5, load15 = luci.sys.loadavg()
 s:option(DummyValue, "_la", translate("Load")).value =
  string.format("%.2f, %.2f, %.2f", load1, load5, load15)