From b5936aa9096b3e35340e3591ca0c8deb6845dfce Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 22 Sep 2021 14:47:51 +0200 Subject: [PATCH] netconfig: revert NM default policy change change (boo#1185882) With the change to the default policy, netconfig with NetworkManager as network.service accepted settings from all services/programs directly instead only from NetworkManager, where plugins/services have to deliver their settings to apply them. This reverts commit 264790a0b39775b2b509fecd38d44b5b91d5a89d. --- doc/netconfig.8 | 5 ++--- scripts/functions.netconfig | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/netconfig.8 b/doc/netconfig.8 index 4354bba..acc11ea 100644 --- a/doc/netconfig.8 +++ b/doc/netconfig.8 @@ -163,11 +163,10 @@ The \fBauto\fR policy value is resolved to a policy "\fBSTATIC *\fR". .TP .IR NetworkManager \ is \ enabled -The \fBauto\fR policy value is resolved to "\fBSTATIC_FALLBACK * NetworkManager\fR" +The \fBauto\fR policy value is resolved to "\fBSTATIC_FALLBACK NetworkManager\fR" causing to use the NetworkManager build-in merge policy with a fallback to the static settings defined in netconfig variables when the NetworkManager -does not provide any. Since version 0.84.3, the policy permits also other -non-NetworkManager per interface settings provided by other services. +does not provide any. Note: NetworkManager is not using any of the statically defined netconfig settings. diff --git a/scripts/functions.netconfig b/scripts/functions.netconfig index 0fd0da4..dc62c11 100644 --- a/scripts/functions.netconfig +++ b/scripts/functions.netconfig @@ -81,7 +81,7 @@ netconfig_policy() # Use NetworkManager policy merged data # test "x$policy" = "xauto" && \ - policy='STATIC_FALLBACK * NetworkManager' + policy='STATIC_FALLBACK NetworkManager' ;; network.service|*) #