aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-11-08 20:39:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-11-08 20:39:37 +0000
commit17ce564107c650b22ac4a1699f7abdb2eeace10a (patch)
tree8f2e3eabe1e21d28d860c19b1a1105f853346d2c /package
parent23fbd97649b4ce98716393815892a05892739904 (diff)
downloadupstream-17ce564107c650b22ac4a1699f7abdb2eeace10a.tar.gz
upstream-17ce564107c650b22ac4a1699f7abdb2eeace10a.tar.bz2
upstream-17ce564107c650b22ac4a1699f7abdb2eeace10a.zip
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
Diffstat (limited to 'package')
-rw-r--r--package/network/utils/conntrack-tools/Makefile7
-rw-r--r--package/network/utils/conntrack-tools/files/conntrackd.init1
2 files changed, 1 insertions, 7 deletions
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