mirror
/
gluon-packages
mirror of https://github.com/freifunk-gluon/packages.git
1
0
Fork 0
Code Releases Activity

Merge branch 'config-mode-hostname' of https://github.com/freifunk-gluon/packages

This commit is contained in:
Matthias Schiffer 2014-01-29 19:37:16 +01:00
parent 355afe9da5 a0f55b6c3c
commit 15363f249b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
View File

@ -58,8 +58,11 @@ function action_reboot()
uci:save("gluon-config-mode") uci:save("gluon-config-mode")
uci:commit("gluon-config-mode") uci:commit("gluon-config-mode")
hostname = uci:get_first("system", "system", "hostname")
if nixio.fork() ~= 0 then if nixio.fork() ~= 0 then
luci.template.render("gluon-config-mode/reboot", {pubkey=pubkey}) luci.template.render("gluon-config-mode/reboot",
{pubkey=pubkey, hostname=hostname})
else else
debug.setfenv(io.stdout, debug.getfenv(io.open '/dev/null')) debug.setfenv(io.stdout, debug.getfenv(io.open '/dev/null'))
io.stdout:close() io.stdout:close()

4
gluon/gluon-config-mode/generate/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
View File

@ -15,7 +15,7 @@ $Id$
<html> <html>
<head> <head>
<title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></title> <title><%=hostname%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></title>
<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" /> <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
</head> </head>
<body> <body>
@ -28,7 +28,7 @@ $Id$
@config_mode.msg_pubkey@ @config_mode.msg_pubkey@
</p> </p>
<div class="the-key"> <div class="the-key">
# <%=luci.sys.hostname()%> # <%=hostname%>
<br/> <br/>
<%=pubkey%> <%=pubkey%>
</div> </div>