Merge pull request #873 from arjendekorte/patch-5

luci-theme-bootstrap: fix minor CSS errors

diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound.lua
index 22f0200..6d876c2 100644 (file)
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound.lua
@@ -1,5 +1,6 @@
 -- Copyright 2008 Steven Barth <steven@midlink.org>
 -- Copyright 2016 Eric Luehrsen <ericluehrsen@hotmail.com>
+-- Copyright 2016 Dan Luedtke <mail@danrl.com>
 -- Licensed to the public under the Apache License 2.0.
 
 m = Map("unbound", translate("Recursive DNS"),
@@ -80,6 +81,17 @@ tlm = s:taboption("service", Value, "ttl_min", translate("TTL Minimum:"),
 tlm.datatype = "and(uinteger,min(0),max(600))"
 tlm.rmempty = false
 
+d64 = s:taboption("service", Flag, "dns64", translate("Enable DNS64:"),
+  translate("Enable the DNS64 module"))
+d64.rmempty = false
+
+pfx = s:taboption("service", Value, "dns64_prefix", translate("DNS64 Prefix:"),
+  translate("Prefix for generated DNS64 addresses"))
+pfx.datatype = "ip6addr"
+pfx.placeholder = "64:ff9b::/96"
+pfx.optional = true
+pfx:depends({ dns64 = "1" })
+
 --Resource Tuning Tab
 
 rsn = s:taboption("resource", ListValue, "recursion", translate("Recursion Strength:"),

diff --git a/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/contrib/package/freifunk-common/files/usr/bin/neigh.sh
index b1dc01a..468ed7a 100755 (executable)
--- a/contrib/package/freifunk-common/files/usr/bin/neigh.sh
+++ b/contrib/package/freifunk-common/files/usr/bin/neigh.sh
@@ -66,7 +66,8 @@ VARS="$VARS neighborLinkQuality:NLQ linkCost:Cost remoteHostname:Host"
 
 for HOST in '127.0.0.1' '::1';do
        json_init
-       json_load "$(echo /links|nc ${HOST} 9090)"
+       json_load "$( echo /links | nc $HOST 9090 | sed -n '/^[}{ ]/p' )"       # remove header/non-json
+
        if json_is_a links array;then
                json_select links
                for v in ${VARS};do