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 978467b01657ea21c72e0fe1e6437432c1155e3e..476281f3a858be1802bc0d89694a270f1ed9529f 100644 (file)
--- 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
 
  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
 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 \
        $(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 a51eb885f2e955d8e548278de9b634349d58935a..0e2945c9a5f8e07256cd91c0a78c4c2f0d15e0a8 100644 (file)
--- 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() {
 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
        procd_open_instance
 
        procd_set_param command $PROG -C /etc/conntrackd/conntrackd.conf