Update upstream source from tag 'upstream/1.32.10'

Update to upstream version '1.32.10' with Debian dir fcf2778b50b013ede3e7375bc1d829e984175658
author: Sebastien Bacher <seb128@ubuntu.com> 2021-08-25 15:24:42 +0200
committer: Sebastien Bacher <seb128@ubuntu.com> 2021-08-25 15:24:42 +0200
commit: dbb91282fa488964fb20595f9494a9f0e4f36a58 (patch)
tree: 142bc942e5320b35514cdf03a5f9f47a9b89df0e /docs/api/html/NetworkManager.conf.html
parent: 5f2ede3a2813b0e9204befdcfc67509d34be71c6 (diff)
parent: cfb80376641fa49137b9996130352697e7f8b436 (diff)
1 files changed, 127 insertions, 2 deletions
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 96ff2802..e8efb5e7 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -8,7 +8,7 @@
 <link rel="up" href="manpages.html" title="Part I. Manual Pages">
 <link rel="prev" href="NetworkManager.html" title="NetworkManager">
 <link rel="next" href="NetworkManager-dispatcher.html" title="NetworkManager-dispatcher">
-<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.0 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -830,6 +830,10 @@ ipv6.ip6-privacy=0
            and 100 for other profiles.</p></td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="varname">ipv4.required-timeout</code></span></p></td>
+<td></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">ipv4.route-metric</code></span></p></td>
 <td></td>
 </tr>
@@ -873,6 +877,10 @@ ipv6.ip6-privacy=0
           </p></td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="varname">ipv6.required-timeout</code></span></p></td>
+<td></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">ipv6.route-metric</code></span></p></td>
 <td></td>
 </tr>
@@ -1127,6 +1135,63 @@ managed=1
 </td>
 </tr>
 <tr>
+<td><p><a name="keep-configuration"></a><span class="term"><code class="varname">keep-configuration</code></span></p></td>
+<td>
+<p>
+              On startup, NetworkManager tries to not interfere with
+              interfaces that are already configured. It does so by
+              generating a in-memory connection based on the interface
+              current configuration.
+            </p>
+<p>
+              If this generated connection matches one of the existing
+              persistent connections, the persistent connection gets
+              activated. If there is no match, the generated
+              connection gets activated as "external", which means
+              that the connection is considered as active, but
+              NetworkManager doesn't actually touch the interface.
+            </p>
+<p>
+              It is possible to disable this behavior by setting
+              <code class="literal">keep-configuration</code> to
+              <code class="literal">no</code>. In this way, on startup
+              NetworkManager always tries to activate the most
+              suitable persistent connection (the one with highest
+              autoconnect-priority or, in case of a tie, the one
+              activated most recently).
+            </p>
+<p>
+              Note that when NetworkManager gets restarted, it stores
+              the previous state in
+              <code class="filename">/run/NetworkManager</code>; in particular
+              it saves the UUID of the connection that was previously
+              active so that it can be activated again after the
+              restart. Therefore,
+              <code class="literal">keep-configuration</code> does not have
+              any effect on service restart.
+            </p>
+</td>
+</tr>
+<tr>
+<td><p><a name="allowed-connections"></a><span class="term"><code class="varname">allowed-connections</code></span></p></td>
+<td>
+<p>
+              A list of connections that can be activated on the
+              device. See <a class="xref" href="NetworkManager.conf.html#connection-spec" title="Connection List Format">the section called “Connection List Format”</a> for the
+              syntax to specify a connection. If this option is not
+              specified, all connections can be potentially activated
+              on the device, provided that the connection type and
+              other settings match.
+            </p>
+<p>
+              A notable use case for this is to filter which
+              connections can be activated based on how they were
+              created; see the <code class="literal">origin</code> keyword in
+              <a class="xref" href="NetworkManager.conf.html#connection-spec" title="Connection List Format">the section called “Connection List Format”</a>.
+            </p>
+</td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">wifi.scan-rand-mac-address</code></span></p></td>
 <td><p>
               Configures MAC address randomization of a Wi-Fi device during
@@ -1644,6 +1709,66 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
 <p>
       </p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="connection-spec"></a><h3>Connection List Format</h3>
+<p>
+          Connections can be specified using the following format:
+      </p>
+<p>
+      </p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term">*</span></p></td>
+<td><p>Matches every connection.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">uuid:UUID</span></p></td>
+<td><p>Match the connection by UUID, for example
+          <code class="literal">"uuid:83037490-1d17-4986-a397-01f1db3a7fc2"</code></p></td>
+</tr>
+<tr>
+<td><p><span class="term">id=ID</span></p></td>
+<td><p>Match the connection by name.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">origin:ORIGIN</span></p></td>
+<td><p>Match the connection by origin, stored in the
+          <code class="literal">org.freedesktop.NetworkManager.origin</code> tag of the user setting. For example, use
+          <code class="literal">"except:origin:nm-initrd-generator"</code> to forbid activation of connections created by the
+          initrd generator.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">except:SPEC</span></p></td>
+<td>
+<p>Negative match of a connection. A negative match has higher priority then the positive
+          matches above.</p>
+<p>If there is a list consisting only of negative matches, the behavior is the same as if there is also
+          match-all. That means, if none of all the negative matches is satisfied, the overall result is still a
+          positive match.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term">SPEC[,;]SPEC</span></p></td>
+<td>
+<p>Multiple specs can be concatenated with commas or semicolons. The order does not matter as
+          matches are either inclusive or negative (<code class="literal">except:</code>), with negative matches having higher
+          priority.</p>
+<p>Backslash is supported to escape the separators ';' and ',', and to express special characters such as
+          newline ('\n'), tabulator ('\t'), whitespace ('\s') and backslash ('\\'). Whitespace is not a separator but
+          will be trimmed between two specs (unless escaped as '\s').</p>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p>
+      </p>
+</div>
 </div>
 <div class="refsect1">
 <a name="id-1.2.3.19"></a><h2>See Also</h2>
@@ -1659,6 +1784,6 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.33.1</div>
+<hr>Generated by GTK-Doc V1.33.0</div>
 </body>
 </html>
\ No newline at end of file
author	Sebastien Bacher <seb128@ubuntu.com>	2021-08-25 15:24:42 +0200
committer	Sebastien Bacher <seb128@ubuntu.com>	2021-08-25 15:24:42 +0200
commit	dbb91282fa488964fb20595f9494a9f0e4f36a58 (patch)
tree	142bc942e5320b35514cdf03a5f9f47a9b89df0e /docs/api/html/NetworkManager.conf.html
parent	5f2ede3a2813b0e9204befdcfc67509d34be71c6 (diff)
parent	cfb80376641fa49137b9996130352697e7f8b436 (diff)