Author: nbd
Date: 2015-11-08 21:39:37 +0100 (Sun, 08 Nov 2015)
New Revision: 47422

Modified:
   trunk/package/network/utils/conntrack-tools/Makefile
   trunk/package/network/utils/conntrack-tools/files/conntrackd.init
Log:
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 <[email protected]>

Modified: trunk/package/network/utils/conntrack-tools/Makefile
===================================================================
--- trunk/package/network/utils/conntrack-tools/Makefile        2015-11-08 
20:39:24 UTC (rev 47421)
+++ trunk/package/network/utils/conntrack-tools/Makefile        2015-11-08 
20:39:37 UTC (rev 47422)
@@ -47,17 +47,10 @@
  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 \

Modified: trunk/package/network/utils/conntrack-tools/files/conntrackd.init
===================================================================
--- trunk/package/network/utils/conntrack-tools/files/conntrackd.init   
2015-11-08 20:39:24 UTC (rev 47421)
+++ trunk/package/network/utils/conntrack-tools/files/conntrackd.init   
2015-11-08 20:39:37 UTC (rev 47422)
@@ -8,6 +8,7 @@
 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
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to