From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 16 Jan 2020 18:17:47 +0000 (+0100)
Subject: Revert "sysctl: always write net.ipv4.conf.all.xyz= in addition to net.ipv4.conf... 
X-Git-Tag: v245-rc1~22^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=def94437934bc83355528e6ca1e75e706d90118e;p=thirdparty%2Fsystemd.git

Revert "sysctl: always write net.ipv4.conf.all.xyz= in addition to net.ipv4.conf.default.xyz="

This reverts commits 1836bf9e1d70240c8079e4db4312309f4f1f91fd
and 9fefb9e3cdebcefa681672423d23ccc72ae6c165.

The race is reintroduced, and will be fixed later.
---

diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
index 41bd1f91832..c22d690de47 100644
--- a/sysctl.d/50-default.conf
+++ b/sysctl.d/50-default.conf
@@ -22,13 +22,13 @@ kernel.sysrq = 16
 kernel.core_uses_pid = 1
 
 # Source route verification
-net.ipv4.conf.all.rp_filter = 2
+net.ipv4.conf.default.rp_filter = 2
 
 # Do not accept source routing
-net.ipv4.conf.all.accept_source_route = 0
+net.ipv4.conf.default.accept_source_route = 0
 
 # Promote secondary addresses when the primary address is removed
-net.ipv4.conf.all.promote_secondaries = 1
+net.ipv4.conf.default.promote_secondaries = 1
 
 # ping(8) without CAP_NET_ADMIN and CAP_NET_RAW
 # The upper limit is set to 2^31-1. Values greater than that get rejected by