summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-06-22 13:14:10 +0200
committerThomas Haller <thaller@redhat.com>2016-06-30 08:07:35 +0200
commit3cda2df12b6a5e3c4c62415c50eb45cd1b1b63f8 (patch)
tree3916d923bf4d30e8cef3f3e9c23159245a4da5b4 /man
parent6a71f13717984c41e9e016ff7cd7dbe09da889d5 (diff)
downloadNetworkManager-3cda2df12b6a5e3c4c62415c50eb45cd1b1b63f8.tar.gz
config: add support for per-device configuration to NetworkManager.conf
Add a new [device*] section to NetworkManager.conf. This works similar like the default connection settings in [connection*]. This will allow us to express per-device configuration in NetworkManager.conf in our familar style. Later, via NMConfig's write API it will be possible to make settings accessible via D-Bus and persist them in NetworkManager-intern.conf. This way, the user can both edit configuration snippets and modify them via D-Bus, and also support installing default configuration from the package. In a way, a [device*] setting is similar to networkd's link files. The match options is all encoded in the match-device specs. One difference is, that the resulting setting can be merged together by multiple section by partially overwriting them. This makes it more flexible and allows for example to drop a configuration snippet that only sets one property, while the rest can be merged from different snippets.
Diffstat (limited to 'man')
-rw-r--r--man/NetworkManager.conf.xml36
1 files changed, 35 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 9fa89aa443..580bdd3c9e 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -623,7 +623,7 @@ ipv6.ip6-privacy=0
</para>
</refsect2>
- <refsect2>
+ <refsect2 id="connection-sections">
<title>Sections</title>
<para>
You can configure multiple <literal>connection</literal>
@@ -697,6 +697,40 @@ ipv6.ip6-privacy=1
</refsect1>
<refsect1>
+ <title><literal>device</literal> section</title>
+ <para>Contains per-device persistent configuration.
+ </para>
+ <para>
+ Example:
+<programlisting>
+[device]
+match-device=interface-name:eth3
+unmanaged=1
+</programlisting>
+ </para>
+ <refsect2>
+ <title>Supported Properties</title>
+ <para>
+ The following properties can be configured per-device.
+ <variablelist>
+ </variablelist>
+ </para>
+ </refsect2>
+
+ <refsect2>
+ <title>Sections</title>
+ <para>
+ The <literal>[device]</literal> section works the same as the <literal>[connection]</literal> section.
+ That is, multiple sections that all start with the prefix "device" can be specified.
+ The settings "match-device" and "stop-match" are available to match a device section
+ on a device. The order of multiple sections is also top-down within the file and
+ later files overwrite previous settings. See <xref linkend="connection-sections"/>
+ for details.
+ </para>
+ </refsect2>
+ </refsect1>
+
+ <refsect1>
<title><literal>connectivity</literal> section</title>
<para>This section controls NetworkManager's optional connectivity
checking functionality. This allows NetworkManager to detect