From patchwork Wed Nov 4 16:56:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Weber X-Patchwork-Id: 540069 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 81A61140E1A for ; Thu, 5 Nov 2015 04:00:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=b2+WYdmP; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id BC15828BE5F; Wed, 4 Nov 2015 17:57:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 674B72800BA for ; Wed, 4 Nov 2015 17:56:00 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 4 Nov 2015 17:55:58 +0100 (CET) Received: by wmff134 with SMTP id f134so46865674wmf.0 for ; Wed, 04 Nov 2015 08:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=+EgPN4xExECkiCvjhRwtUb6QkO/yenv+JwyrJTg+zQ4=; b=b2+WYdmPC2KezcAY6UytgLT0iHcYZglYNJl0zYTVGVlZH+IWha2kuMhtPa/iAott2v 2Z5GTxYD+y7ADYFYn5ojgPwjkvJBmmUNpEMGEdMlbaME2x9pDJj6VArsFhklYzCjVz60 SRV/3GBqV/ZOwVRo5Mtqy8JlJy5dWxdwe7+4lIaSYC57um6UiYOPJtiXrZt/MJvSCgtf OtcxW2aESAS/q66C1UiAdA3IxV6IQrod3lwvvckF+/sp2kiL1WBJDtzgeZ6mFEiHe0fV evy0Ps4yNiGPwg5Q8lODV7JwxnscNaTjkEWAg7FK9PvPChX1fE2idIVCo40I0qtrbStB ueuA== X-Received: by 10.28.52.17 with SMTP id b17mr4833917wma.41.1446656267279; Wed, 04 Nov 2015 08:57:47 -0800 (PST) Received: from localhost.localdomain ([5.158.136.57]) by smtp.googlemail.com with ESMTPSA id gd10sm2453443wjb.47.2015.11.04.08.57.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Nov 2015 08:57:46 -0800 (PST) From: Ulrich Weber X-Google-Original-From: Ulrich Weber To: openwrt-devel@lists.openwrt.org Date: Wed, 4 Nov 2015 17:56:50 +0100 Message-Id: <1446656212-20082-1-git-send-email-uw@ocedo.com> X-Mailer: git-send-email 1.9.1 Cc: Ulrich Weber Subject: [OpenWrt-Devel] [PATCH 1/3] conntrack-tools: remove default config file X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" default configuration will fill up disk by writing /var/log/conntrackd-stats.log Introduced due init script auto start. Signed-off-by: Ulrich Weber --- package/network/utils/conntrack-tools/Makefile | 7 ------- package/network/utils/conntrack-tools/files/conntrackd.init | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) 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