Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / config / etc / sysctl.conf

diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index 011c4287ea04f7194548ac9a27e88b9e2701bf53..46ab4e1d4ad9850958c0e665411aadc4529a50a7 100644 (file)
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -1,9 +1,6 @@
 net.ipv4.ip_forward = 1
 net.ipv4.ip_dynaddr = 1
 
-# Disable Path MTU Discovery
-net.ipv4.ip_no_pmtu_disc = 1
-
 net.ipv4.icmp_echo_ignore_broadcasts = 1
 net.ipv4.icmp_ignore_bogus_error_responses = 1
 net.ipv4.icmp_ratelimit = 1000
@@ -27,7 +24,7 @@ net.ipv4.conf.all.accept_source_route = 0
 net.ipv4.conf.all.log_martians = 1
 
 kernel.printk = 1 4 1 7
-vm.swappiness=0
+vm.swappiness=1
 vm.mmap_min_addr = 4096
 vm.min_free_kbytes = 8192
 
@@ -44,7 +41,7 @@ net.bridge.bridge-nf-call-iptables = 0
 net.bridge.bridge-nf-call-arptables = 0
 
 # Try to keep kernel address exposures out of various /proc files (kallsyms, modules, etc).
-kernel.kptr_restrict = 1
+kernel.kptr_restrict = 2
 
 # Avoid kernel memory address exposures via dmesg.
 kernel.dmesg_restrict = 1