diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-16 21:39:26 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-16 21:40:49 +0100 |
| commit | 9e1383dd40ba49e54cddedd04938c55609cc1f08 (patch) | |
| tree | be856723c1db509d96ba3fabd6bc1f9bf22328c9 | |
| parent | 2ebc394347bf4a402c6b9ef7ea9e42a8a1f5ba85 (diff) | |
luci-mod-admin-full: directly require luci.version and fetch uname with library call
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
| -rw-r--r-- | modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm | 8 |
1 files changed, 5 insertions, 3 deletions
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 6fca1c6b0..5f4539c61 100644 --- 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> |