diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2015-02-27 10:42:39 +0100 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2015-02-27 10:42:39 +0100 |
| commit | 44d70c592ad922dfd7e585f2592a4aa156fc02dc (patch) | |
| tree | 580ae3592298bb01754dde4673d0ef1d0354c46a | |
| parent | ef78e5b24e31df90f91b811da7e30ce1d236d8e0 (diff) | |
| download | initscripts-44d70c592ad922dfd7e585f2592a4aa156fc02dc.tar initscripts-44d70c592ad922dfd7e585f2592a4aa156fc02dc.tar.gz initscripts-44d70c592ad922dfd7e585f2592a4aa156fc02dc.tar.bz2 initscripts-44d70c592ad922dfd7e585f2592a4aa156fc02dc.tar.xz initscripts-44d70c592ad922dfd7e585f2592a4aa156fc02dc.zip | |
sysctl.conf: move bridge setting to module-init-tools
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rw-r--r-- | sysctl.conf | 5 | ||||
| -rw-r--r-- | sysctl.conf.ppc64 | 5 | ||||
| -rw-r--r-- | sysctl.conf.x86_64 | 5 |
4 files changed, 1 insertions, 16 deletions
diff --git a/initscripts.spec b/initscripts.spec index 90c83e5c..0c5d261d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -14,7 +14,7 @@ Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid -Requires: module-init-tools +Requires: module-init-tools >= 3.9-25 Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87 diff --git a/sysctl.conf b/sysctl.conf index 55ffe6e6..519d61ec 100644 --- a/sysctl.conf +++ b/sysctl.conf @@ -22,11 +22,6 @@ kernel.core_uses_pid = 1 # Controls the use of TCP syncookies net.ipv4.tcp_syncookies = 1 -# Disable netfilter on bridges. -net.bridge.bridge-nf-call-ip6tables = 0 -net.bridge.bridge-nf-call-iptables = 0 -net.bridge.bridge-nf-call-arptables = 0 - # Controls the default maxmimum size of a mesage queue kernel.msgmnb = 65536 diff --git a/sysctl.conf.ppc64 b/sysctl.conf.ppc64 index 2409c6f1..049c55d3 100644 --- a/sysctl.conf.ppc64 +++ b/sysctl.conf.ppc64 @@ -22,11 +22,6 @@ kernel.core_uses_pid = 1 # Controls the use of TCP syncookies net.ipv4.tcp_syncookies = 1 -# Disable netfilter on bridges. -net.bridge.bridge-nf-call-ip6tables = 0 -net.bridge.bridge-nf-call-iptables = 0 -net.bridge.bridge-nf-call-arptables = 0 - # Controls the default maxmimum size of a mesage queue kernel.msgmnb = 65536 diff --git a/sysctl.conf.x86_64 b/sysctl.conf.x86_64 index 1fe3fdda..f43b4804 100644 --- a/sysctl.conf.x86_64 +++ b/sysctl.conf.x86_64 @@ -22,11 +22,6 @@ kernel.core_uses_pid = 1 # Controls the use of TCP syncookies net.ipv4.tcp_syncookies = 1 -# Disable netfilter on bridges. -net.bridge.bridge-nf-call-ip6tables = 0 -net.bridge.bridge-nf-call-iptables = 0 -net.bridge.bridge-nf-call-arptables = 0 - # Controls the default maxmimum size of a mesage queue kernel.msgmnb = 65536 |