From patchwork Mon Jun 29 14:53:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3232 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49wVqG4cDKz3x5j for ; Mon, 29 Jun 2020 14:53:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49wVqD4ZLKz2LD; Mon, 29 Jun 2020 14:53:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49wVqD2sfhz2yvs; Mon, 29 Jun 2020 14:53:28 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49wVqC0ThRz2yNV for ; Mon, 29 Jun 2020 14:53:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49wVqB5F8Xz1gS; Mon, 29 Jun 2020 14:53:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1593442406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=efz0CTkcgsQv/XQptpZnKU+vAnYVd/DyCb+n+QligeQ=; b=z1gcf6JTkPWMG2t2Tw6aMrKnOcYNMq+ohlg5wwvWQ4XvdjdhR2Ezej7Hq3d2QTJNY8X/FL aw13dyRVTMrz1TAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1593442406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=efz0CTkcgsQv/XQptpZnKU+vAnYVd/DyCb+n+QligeQ=; b=PxI6D+deH+vetCCp+9V7zc87WAcoxPR9/OpPjnFJwUViYvpHIR+6TxDCPdl3PyQndgDLGj As18SxSzliO2ULbRieBYwfj+L02aGqXKg0YHkyQnDiSB4s3Efi5cawcy2PzErDaKRHfzCQ xozCP+AKmERXoyRu0hBp2Xw1FmPjD45rt5W9mIAMwa36m8qOZ1bYP46jkfbI7xDmmE2sIP g4EtCxfuhujlyhlXJV7wnOtdphpoREfCEUkdQoSoFLnianSRa67MWuss1SYPu3rYTTx138 plYPiQNNMOWTeWZu4XMKSXy/AEZqTVBCC0hdzri4n8Gu2zaXahOOLaog/xyF4Q== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/2] Revert "sysctl: Load nf_log_ipv4 as default logging module for TRACE target" Date: Mon, 29 Jun 2020 14:53:18 +0000 Message-Id: <20200629145318.7339-2-michael.tremer@ipfire.org> In-Reply-To: <20200629145318.7339-1-michael.tremer@ipfire.org> References: <20200629145318.7339-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This reverts commit 224adebdc44dece1e21193dd7ab4090e102349e8. The configuration could not be loaded here, because the nf_log_ipv4 kernel module wasn't loaded, yet. Signed-off-by: Michael Tremer --- config/etc/sysctl.conf | 3 --- config/rootfiles/core/147/filelists/files | 1 - 2 files changed, 4 deletions(-) diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 98a0dbe63..7e7ebee44 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -34,9 +34,6 @@ net.ipv6.conf.default.disable_ipv6 = 1 # Enable netfilter accounting net.netfilter.nf_conntrack_acct=1 -# Enable TRACE logging to syslog -net.netfilter.nf_log.2=nf_log_ipv4 - # Disable netfilter on bridges. net.bridge.bridge-nf-call-ip6tables = 0 net.bridge.bridge-nf-call-iptables = 0 diff --git a/config/rootfiles/core/147/filelists/files b/config/rootfiles/core/147/filelists/files index fe33d7d71..13e6e04aa 100644 --- a/config/rootfiles/core/147/filelists/files +++ b/config/rootfiles/core/147/filelists/files @@ -10,6 +10,5 @@ etc/rc.d/init.d/functions etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/red etc/rc.d/init.d/partresize -etc/sysctl.conf var/ipfire/header.pl var/ipfire/general-functions.pl