diff options
| -rw-r--r-- | core/contrib/uci/luci | 2 | ||||
| -rw-r--r-- | module/admin-core/src/controller/admin/uci.lua | 2 | ||||
| -rw-r--r-- | module/admin-core/src/model/cbi/admin_network/dhcp.lua | 4 | ||||
| -rw-r--r-- | module/public-core/src/view/public_index/contact.htm | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/core/contrib/uci/luci b/core/contrib/uci/luci index 3e8dcc89aa..a2b61f483a 100644 --- a/core/contrib/uci/luci +++ b/core/contrib/uci/luci @@ -17,7 +17,7 @@ config extern flash_keep config event uci_oncommit option network "/etc/init.d/network restart" option wireless "/etc/init.d/network restart" - option olsr "reboot" + option olsr "/sbin/reboot" option dhcp "/etc/init.d/dnsmasq restart" option luci_fw "/etc/init.d/luci_fw restart" option dropbear "/etc/init.d/dropbear restart" diff --git a/module/admin-core/src/controller/admin/uci.lua b/module/admin-core/src/controller/admin/uci.lua index 1a3ae1279f..251107dfe7 100644 --- a/module/admin-core/src/controller/admin/uci.lua +++ b/module/admin-core/src/controller/admin/uci.lua @@ -25,7 +25,7 @@ function action_apply() if ffluci.config.uci_oncommit then for i, cmd in ipairs(apply) do if cmd then - output = output .. cmd .. ":" .. ffluci.sys.exec(cmd) + output = output .. cmd .. ":" .. ffluci.sys.exec(cmd) .. "\n" end end end diff --git a/module/admin-core/src/model/cbi/admin_network/dhcp.lua b/module/admin-core/src/model/cbi/admin_network/dhcp.lua index 0c37b89552..766d87da2f 100644 --- a/module/admin-core/src/model/cbi/admin_network/dhcp.lua +++ b/module/admin-core/src/model/cbi/admin_network/dhcp.lua @@ -18,7 +18,9 @@ end s:option(Value, "start", "Start", "Erste vergebene Adresse (letztes Oktett)").rmempty = true -s:option(Value, "limit", "Limit", "Letzte vergebene Adresse (letztes Oktett)").rmempty = true +s:option(Value, "limit", "Limit", "Anzahl zu vergebender Adressen -1").rmempty = true + +s:option(Value, "leasetime", "Laufzeit").rmempty = true s:option(Flag, "dynamicdhcp", "Dynamisches DHCP").rmempty = true diff --git a/module/public-core/src/view/public_index/contact.htm b/module/public-core/src/view/public_index/contact.htm index d19df7e4c0..df34812af9 100644 --- a/module/public-core/src/view/public_index/contact.htm +++ b/module/public-core/src/view/public_index/contact.htm @@ -1,5 +1,5 @@ <%+header%> -<% local contact = ffluci.model.uci.show("freifunk", "contact").freifunk.contact %> +<% local contact = ffluci.model.uci.show("freifunk").freifunk.contact %> <h1><%:contact Kontakt%></h1> <table cellspacing="0" cellpadding="6"> <tr><th><%:nickname Pseudonym%>:</th><td><%=contact.nickname%></td></tr> |