Skip to content

Commit

Permalink
netconfig: revert NM default policy change change (boo#1185882)
Browse files Browse the repository at this point in the history
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 264790a.
  • Loading branch information
mtomaschewski committed Sep 22, 2021
1 parent e40dc73 commit b5936aa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions doc/netconfig.8
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion scripts/functions.netconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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|*)
#
Expand Down

0 comments on commit b5936aa

Please sign in to comment.