Merge pull request #404 from mwarning/nodogsplash

nodogsplash: fix minor things

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 5548c1eddff939d30298cacc4d092d1bfbdcb2c4..c72f75b3107c4f45941e175bce9b6cb2fe220106 100644 (file)
--- 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 97b04e00a165fd01fb7279d8a2e0854313dd0ead..c4f461ac48ae4d44a8e0ae92c6fce5207a8b3e0e 100644 (file)
--- 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