summaryrefslogtreecommitdiff
path: root/man/NetworkManager.conf.xml
diff options
context:
space:
mode:
Diffstat (limited to 'man/NetworkManager.conf.xml')
-rw-r--r--man/NetworkManager.conf.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 0dc1b700d9..d8fa1b3b95 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -233,7 +233,10 @@ no-auto-default=*
if specified (See <xref linkend="ignore-carrier"/>).
Otherwise, it is a list of matches to specify for which device
carrier should be ignored. See <xref linkend="device-spec"/> for the
- syntax how to specify a device.
+ syntax how to specify a device. Note that master types like
+ bond, bridge, and team ignore carrier by default. You can however
+ revert that default using the "except:" specifier (or better,
+ use the per-device setting instead of the deprecated setting).
</para>
</listitem>
</varlistentry>
@@ -840,6 +843,10 @@ unmanaged=1
that NetworkManager will not make use of that information.
</para>
<para>
+ Master types like bond, bridge and team ignore carrier by default,
+ while other device types react on carrier changes by default.
+ </para>
+ <para>
This setting overwrites the deprecated <literal>main.ignore-carrier</literal>
setting above.
</para>