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

d87ba9eb · Matthias Schiffer · 869f81d1 · 1097fadc · d87ba9eb · d87ba9eb
Commit d87ba9eb authored 11 years ago by Matthias Schiffer
--- a/package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
+++ b/package/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
@@ -58,8 +58,11 @@ function action_reboot()
  uci:save("gluon-config-mode")
  uci:commit("gluon-config-mode")
+  hostname = uci:get_first("system", "system", "hostname")
  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
    debug.setfenv(io.stdout, debug.getfenv(io.open '/dev/null'))
    io.stdout:close()

--- a/package/gluon-config-mode/generate/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
+++ b/package/gluon-config-mode/generate/usr/lib/lua/luci/view/gluon-config-mode/reboot.htm
@@ -15,7 +15,7 @@ $Id$
 <html>
  <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" />
  </head>
  <body>
@@ -28,7 +28,7 @@ $Id$
            @config_mode.msg_pubkey@
          </p>
          <div class="the-key">
-            # <%=luci.sys.hostname()%>
+            # <%=hostname%>
            <br/>
            <%=pubkey%>
          </div>