summaryrefslogtreecommitdiff
path: root/nodogsplash
diff options
context:
space:
mode:
authorMoritz Warning <moritzwarning@web.de>2018-08-17 11:38:57 +0200
committerMoritz Warning <moritzwarning@web.de>2018-08-17 19:23:00 +0200
commit02966f80c153292cb5b7a1619d46778ce73b96a4 (patch)
tree0459a13e51a73207e2e3028ae7eefd7b2123d539 /nodogsplash
parent938e4dbaa39e8ed3381096e6e29d2637de16365c (diff)
nodogsplash: fix minor package issues
- package now conflicts with nodogsplash2 - properly close heredoc block - quiet uci when removing previous firewall hook Signed-off-by: Moritz Warning <moritzwarning@web.de>
Diffstat (limited to 'nodogsplash')
-rw-r--r--nodogsplash/Makefile1
-rw-r--r--nodogsplash/files/etc/uci-defaults/40_nodogsplash2
2 files changed, 2 insertions, 1 deletions
diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 5548c1e..c72f75b 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -29,6 +29,7 @@ define Package/nodogsplash
DEPENDS:=+libpthread +iptables-mod-ipopt +libmicrohttpd-no-ssl
TITLE:=Open public network gateway daemon
URL:=https://github.com/nodogsplash/nodogsplash
+ CONFLICTS:=nodogsplash2
endef
define Package/nodogsplash/description
diff --git a/nodogsplash/files/etc/uci-defaults/40_nodogsplash b/nodogsplash/files/etc/uci-defaults/40_nodogsplash
index 97b04e0..c4f461a 100644
--- a/nodogsplash/files/etc/uci-defaults/40_nodogsplash
+++ b/nodogsplash/files/etc/uci-defaults/40_nodogsplash
@@ -1,6 +1,6 @@
#!/bin/sh
-uci batch <<-EOT
+uci -q batch <<-EOF
delete firewall.nodogsplash
set firewall.nodogsplash=include
set firewall.nodogsplash.type=script