summary refs log tree commit diff
path: root/docs/api/html/NetworkManager.conf.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api/html/NetworkManager.conf.html')
-rw-r--r--docs/api/html/NetworkManager.conf.html66
1 files changed, 58 insertions, 8 deletions
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index a670fe7d..c4e0d23e 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -229,7 +229,10 @@ no-auto-default=*
             if specified (See <a class="xref" href="NetworkManager.conf.html#ignore-carrier"><code class="varname">ignore-carrier</code></a>).
             Otherwise, it is a list of matches to specify for which device
             carrier should be ignored. See <a class="xref" href="NetworkManager.conf.html#device-spec" title="Device List Format">the section called “Device List Format”</a> 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).
           </p></td>
 </tr>
 <tr>
@@ -392,8 +395,9 @@ no-auto-default=*
             value applies only to connections that can auto-connect
             and have a
             <code class="literal">connection.autoconnect-retries</code> property
-            set to -1. If not specified, connections will be retried 4
-            times.
+            set to -1. If not specified, connections will be tried 4
+            times. Setting this value to 1 means to try activation once,
+            without retry.
           </p></td>
 </tr>
 <tr>
@@ -599,6 +603,11 @@ ipv6.ip6-privacy=0
 </colgroup>
 <tbody>
 <tr>
+<td><p><span class="term"><code class="varname">connection.auth-retries</code></span></p></td>
+<td><p>If left unspecified, the default value is 3 tries before failing the connection.
+          </p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">connection.autoconnect-slaves</code></span></p></td>
 <td></td>
 </tr>
@@ -648,6 +657,18 @@ ipv6.ip6-privacy=0
 <td></td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="varname">ipv4.route-table</code></span></p></td>
+<td><p>If left unspecified, routes are only added to the main table. Note that this
+            is different from explicitly selecting the main table 254, because of how NetworkManager
+            removes extraneous routes from the tables.
+          </p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="varname">ipv6.dhcp-timeout</code></span></p></td>
+<td><p>If left unspecified, the default value for
+           the interface type is used.</p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">ipv6.ip6-privacy</code></span></p></td>
 <td><p>If <code class="literal">ipv6.ip6-privacy</code> is unset, use the content of
             "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback.
@@ -658,6 +679,13 @@ ipv6.ip6-privacy=0
 <td></td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="varname">ipv6.route-table</code></span></p></td>
+<td><p>If left unspecified, routes are only added to the main table. Note that this
+            is different from explicitly selecting the main table 254, because of how NetworkManager
+            removes extraneous routes from the tables.
+          </p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">vpn.timeout</code></span></p></td>
 <td><p>If left unspecified, default value of 60 seconds is used.</p></td>
 </tr>
@@ -684,6 +712,11 @@ ipv6.ip6-privacy=0
 <td><p>If left unspecified, the default value
           "<code class="literal">ignore</code>" will be used.</p></td>
 </tr>
+<tr>
+<td><p><span class="term"><code class="varname">wifi-sec.pmf</code></span></p></td>
+<td><p>If left unspecified, the default value
+          "<code class="literal">optional</code>" will be used.</p></td>
+</tr>
 </tbody>
 </table></div>
 <p>
@@ -781,7 +814,7 @@ ipv6.ip6-privacy=1
 <pre class="programlisting">
 [device]
 match-device=interface-name:eth3
-unmanaged=1
+managed=1
 </pre>
 <p>
     </p>
@@ -797,6 +830,17 @@ unmanaged=1
 </colgroup>
 <tbody>
 <tr>
+<td><p><a name="managed"></a><span class="term"><code class="varname">managed</code></span></p></td>
+<td><p>
+              Whether the device is managed or not. A device can be
+              marked as managed via udev rules (ENV{NM_UNMANAGED}),
+              or via setting plugins (keyfile.unmanaged-devices).
+              This is yet another way. Note that this configuration
+              can be overruled at runtime via D-Bus. Also, it has
+              higher priority then udev rules.
+            </p></td>
+</tr>
+<tr>
 <td><p><a name="ignore-carrier"></a><span class="term"><code class="varname">ignore-carrier</code></span></p></td>
 <td>
 <p>
@@ -823,6 +867,10 @@ unmanaged=1
               that NetworkManager will not make use of that information.
             </p>
 <p>
+              Master types like bond, bridge and team ignore carrier by default,
+              while other device types react on carrier changes by default.
+            </p>
+<p>
               This setting overwrites the deprecated <code class="literal">main.ignore-carrier</code>
               setting above.
             </p>
@@ -1112,10 +1160,12 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
             <code class="filename">/etc/NetworkManager/system-connections</code>.
           </p>
 <p>
-            The stored connection file may contain passwords and
-            private keys, so it will be made readable only to root,
-            and the plugin will ignore files that are readable or
-            writable by any user or group other than root.
+            The stored connection file may contain passwords, secrets and
+            private keys in plain text, so it will be made readable only to
+            root, and the plugin will ignore files that are readable or
+            writable by any user or group other than root. See "Secret flag types"
+            in <a class="link" href="nm-settings.html" title="nm-settings"><span class="citerefentry"><span class="refentrytitle">nm-settings</span>(5)</span></a>
+            for how to avoid storing passwords in plain text.
           </p>
 <p>
             This plugin is always active, and will automatically be