From: Steven Barth Date: Sun, 27 Apr 2008 22:57:29 +0000 (+0000) Subject: * Minor bugfixes X-Git-Tag: 0.8.0~1093 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4700739186c0c4a4cc0cc5ba2ae5e421ee6c2a3f;p=oweals%2Fluci.git * Minor bugfixes --- diff --git a/core/contrib/uci/luci b/core/contrib/uci/luci index 3e8dcc89a..a2b61f483 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 1a3ae1279..251107dfe 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 0c37b8955..766d87da2 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 d19df7e4c..df34812af 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 %>

<%:contact Kontakt%>

<%:nickname Pseudonym%>:<%=contact.nickname%>