From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 8 Nov 2015 20:39:37 +0000 (+0000)
Subject: conntrack-tools: remove default config file
X-Git-Tag: reboot~1603
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=17ce564107c650b22ac4a1699f7abdb2eeace10a;ds=sidebyside

conntrack-tools: remove default config file

default configuration will fill up disk by
writing /var/log/conntrackd-stats.log

Introduced due init script auto start.

Signed-off-by: Ulrich Weber <uw@ocedo.com>

SVN-Revision: 47422
---

diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile
index 978467b016..476281f3a8 100644
--- a/package/network/utils/conntrack-tools/Makefile
+++ b/package/network/utils/conntrack-tools/Makefile
@@ -47,17 +47,10 @@ define Package/conntrack-tools/description
  command line interface conntrack.
 endef
 
-define Package/conntrack-tools/conffiles
-/etc/conntrackd/conntrackd.conf
-endef
-
 TARGET_CFLAGS += -D_GNU_SOURCE=1
 
 define Package/conntrack-tools/install
 	$(INSTALL_DIR) $(1)/etc/conntrackd
-	$(INSTALL_CONF) \
-		$(PKG_BUILD_DIR)/doc/stats/conntrackd.conf \
-		$(1)/etc/conntrackd/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) \
 		$(PKG_INSTALL_DIR)/usr/sbin/conntrack \
diff --git a/package/network/utils/conntrack-tools/files/conntrackd.init b/package/network/utils/conntrack-tools/files/conntrackd.init
index a51eb885f2..0e2945c9a5 100644
--- a/package/network/utils/conntrack-tools/files/conntrackd.init
+++ b/package/network/utils/conntrack-tools/files/conntrackd.init
@@ -8,6 +8,7 @@ USE_PROCD=1
 PROG="/usr/sbin/conntrackd"
 
 start_service() {
+	[ -e /etc/conntrackd/conntrackd.conf ] || return
 	procd_open_instance
 
 	procd_set_param command $PROG -C /etc/conntrackd/conntrackd.conf