summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2017-05-15 17:17:26 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2017-05-24 15:56:15 +0200
commit31656a066bfb3edc106f5efd5d2be46396824930 (patch)
treeac6ef4fce9b9c709ae7c557262cc22aeecdc660a /man
parent44df6d793818c62719a7efe65808beb3461a8436 (diff)
downloadNetworkManager-31656a066bfb3edc106f5efd5d2be46396824930.tar.gz
core: add configuration flag to choose slaves activation order
Commits 39d0559d9a7a ("platform: sort links by name instead of ifindex") and 529a0a1a7f19 ("manager: sort slaves to be autoconnected by device name") changed the order of activation of slaves. Introduce a system-wide configuration property to preserve the old behavior. https://bugzilla.redhat.com/show_bug.cgi?id=1452585
Diffstat (limited to 'man')
-rw-r--r--man/NetworkManager.conf.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 808f7375df..944c4ab603 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -409,6 +409,19 @@ no-auto-default=*
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><varname>slaves-order</varname></term>
+ <listitem>
+ <para>
+ This key specifies in which order slave connections are
+ auto-activated on boot or when the master activates
+ them. Allowed values are <literal>name</literal> (order
+ connection by interface name, the default), or
+ <literal>index</literal> (order slaves by their kernel
+ index).
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>