Merge pull request #32 from mtomaschewski/revert-nm-default-policy-ch…

…ange netconfig: revert NM default policy change change (boo#1185882)
openSUSE · Nov 8, 2021 · 91f4013 · 91f4013
2 parents e40dc73 + b5936aa
commit 91f4013
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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|*)
         #