projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libs/sys: extend luci.sys.hostname() to allow setting a new name
[project/luci.git]
/
modules
/
admin-mini
/
luasrc
/
model
/
cbi
/
mini
/
system.lua
diff --git
a/modules/admin-mini/luasrc/model/cbi/mini/system.lua
b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
index 5c06a0fbeb03ad8cca97d4d5383af66abde96d01..fa23b7c138f8da9393e5b93cdc1c5f34e4afacd2 100644
(file)
--- a/
modules/admin-mini/luasrc/model/cbi/mini/system.lua
+++ b/
modules/admin-mini/luasrc/model/cbi/mini/system.lua
@@
-31,10
+31,10
@@
s:option(DummyValue, "_system", translate("system")).value = system
s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model
local load1, load5, load15 = luci.sys.loadavg()
s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model
local load1, load5, load15 = luci.sys.loadavg()
-s:option(DummyValue, "_la", translate("load")).value =
+s:option(DummyValue, "_la", translate("load")).value =
string.format("%.2f, %.2f, %.2f", load1, load5, load15)
string.format("%.2f, %.2f, %.2f", load1, load5, load15)
-
-s:option(DummyValue, "_memtotal", translate("m_i_memory")).value =
+
+s:option(DummyValue, "_memtotal", translate("m_i_memory")).value =
string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
tonumber(memtotal) / 1024,
100 * memcached / memtotal,
string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
tonumber(memtotal) / 1024,
100 * memcached / memtotal,
@@
-46,11
+46,17
@@
s:option(DummyValue, "_memtotal", translate("m_i_memory")).value =
s:option(DummyValue, "_systime", translate("m_i_systemtime")).value =
os.date("%c")
s:option(DummyValue, "_systime", translate("m_i_systemtime")).value =
os.date("%c")
-
-s:option(DummyValue, "_uptime", translate("m_i_uptime")).value =
+
+s:option(DummyValue, "_uptime", translate("m_i_uptime")).value =
luci.tools.webadmin.date_format(tonumber(uptime))
luci.tools.webadmin.date_format(tonumber(uptime))
-
-s:option(Value, "hostname", translate("hostname"))
+
+hn = s:option(Value, "hostname", translate("hostname"))
+
+function hn.write(self, section, value)
+ Value.write(self, section, value)
+ luci.sys.hostname(value)
+end
+
tz = s:option(ListValue, "zonename", translate("timezone"))
tz:value("UTC")
tz = s:option(ListValue, "zonename", translate("timezone"))
tz:value("UTC")