Merge pull request #1110 from psyborg55/psyborg55-patch-1

luci-app-mwan3: disable uci/sed errors print to syslog

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index cc07bbf..ae1eba2 100644 (file)
--- a/applications/luci-app-adblock/Makefile
+++ b/applications/luci-app-adblock/Makefile
@@ -4,7 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for Adblock
-LUCI_DEPENDS:=+adblock
+LUCI_DEPENDS:=+adblock +luci-lib-jsonc
 LUCI_PKGARCH:=all
 
 include ../../luci.mk

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 362ae79..fbc09b1 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -50,7 +50,7 @@ o2.rmempty = true
 
 o3 = s:option(Value, "adb_triggerdelay", translate("Trigger delay"),
        translate("Additional trigger delay in seconds before adblock processing begins."))
-o3.default = 1
+o3.default = 2
 o3.datatype = "range(1,90)"
 o3.rmempty = false
 

diff --git a/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp b/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp
index a338c75..e9636f9 100755 (executable)
--- a/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp
+++ b/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp
@@ -3,7 +3,7 @@
 uci -q batch <<-EOF >/dev/null
        delete ucitrack.@upnpd[-1]
        add ucitrack upnpd
-       set ucitrack.@upnpd[-1]=miniupnpd
+       set ucitrack.@upnpd[-1].init=miniupnpd
        commit ucitrack
 EOF