diff mbox

[OpenWrt-Devel,1/3] conntrack-tools: remove default config file

Message ID 1446656212-20082-1-git-send-email-uw@ocedo.com
State Accepted
Headers show

Commit Message

Ulrich Weber Nov. 4, 2015, 4:56 p.m. UTC 
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>
---
 package/network/utils/conntrack-tools/Makefile              | 7 -------
 package/network/utils/conntrack-tools/files/conntrackd.init | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)
diff mbox

Patch

diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile
index 978467b..476281f 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 a51eb88..0e2945c 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