luci-0.9: merge r5560

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 74e2ba0d51150ec866f16a11712e63a4f7dec8fc..6b7ff9edcbfd4271573c2f8a4cb8d3546e58f792 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -90,6 +90,8 @@ for i=0,7 do
 end
 willingness.optional = true
 
+natthr = s:option(Value, "NatThreshold")
+natthr.optional = true
 
 
 i = m:section(TypedSection, "Interface", translate("interfaces"))

diff --git a/contrib/package/olsrd-luci/files/etc/config/olsrd b/contrib/package/olsrd-luci/files/etc/config/olsrd
index 50fa556e1d106e12fcc795e4661b35f04ad361f1..5e490c3403c8fad308dca16bc71d168364b53cb0 100644 (file)
--- a/contrib/package/olsrd-luci/files/etc/config/olsrd
+++ b/contrib/package/olsrd-luci/files/etc/config/olsrd
@@ -2,6 +2,7 @@ config 'olsrd'
        option 'IpVersion' '4'
        option 'FIBMetric' 'flat'
        option 'LinkQualityAlgorithm' 'etx_ff'
+       option 'NatThreshold' '0.75'
 
 config 'Interface'
        option 'ignore' '1'