From: Moritz Warning Date: Fri, 17 Aug 2018 09:38:57 +0000 (+0200) Subject: nodogsplash: fix minor package issues X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F404%2Fhead;p=feed%2Frouting.git 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 --- 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