From: Michael Tremer Date: Mon, 29 Jun 2020 14:47:17 +0000 (+0200) Subject: Revert "sysctl: Load nf_log_ipv4 as default logging module for TRACE target" X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49679cb47d8c9dbf3a9dcc21336e579927fe9fa8;p=people%2Fms%2Fipfire-2.x.git Revert "sysctl: Load nf_log_ipv4 as default logging module for TRACE target" 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 --- diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 98a0dbe634..7e7ebee44c 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 fe33d7d716..13e6e04aa6 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