luci-mod-admin-full: directly require luci.version and fetch uname with library call

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index 6fca1c6b0f5b63ee9021188cd64ecef104e33ca7..5f4539c61672c3fef8702eabcb29b70d625c3df3 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -15,6 +15,7 @@ You may obtain a copy of the License at
        local fs = require "nixio.fs"
        local util = require "luci.util"
        local stat = require "luci.tools.status"
+       local ver = require "luci.version"
 
        local has_ipv6 = fs.access("/proc/net/ipv6_route")
        local has_dhcp = fs.access("/etc/config/dhcp")
@@ -22,6 +23,7 @@ You may obtain a copy of the License at
 
        local sysinfo = luci.util.ubus("system", "info") or { }
        local boardinfo = luci.util.ubus("system", "board") or { }
+       local unameinfo = nixio.uname() or { }
 
        local meminfo = sysinfo.memory or {
                total = 0,
@@ -564,10 +566,10 @@ You may obtain a copy of the License at
                <tr><td width="33%"><%:Hostname%></td><td><%=luci.sys.hostname() or "?"%></td></tr>
                <tr><td width="33%"><%:Model%></td><td><%=pcdata(boardinfo.model or boardinfo.system or "?")%></td></tr>
                <tr><td width="33%"><%:Firmware Version%></td><td>
-                       <%=pcdata(luci.version.distname)%> <%=pcdata(luci.version.distversion)%> /
-                       <%=pcdata(luci.version.luciname)%> (<%=pcdata(luci.version.luciversion)%>)
+                       <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> /
+                       <%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>)
                </td></tr>
-               <tr><td width="33%"><%:Kernel Version%></td><td><%=luci.sys.exec("uname -r")%></td></tr>
+               <tr><td width="33%"><%:Kernel Version%></td><td><%=unameinfo.release or "?"%></td></tr>
                <tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr>
                <tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr>
                <tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr>