* Minor bugfixes

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"

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

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
 

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>