summary refs log tree commit diff
path: root/docs/api/html/nm-online.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api/html/nm-online.html')
-rw-r--r--docs/api/html/nm-online.html14
1 files changed, 11 insertions, 3 deletions
diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html
index e84e865f..232dfeb2 100644
--- a/docs/api/html/nm-online.html
+++ b/docs/api/html/nm-online.html
@@ -8,7 +8,7 @@
 <link rel="up" href="manpages.html" title="Part I. Manual Pages">
 <link rel="prev" href="nm-settings-ifcfg-rh.html" title="nm-settings-ifcfg-rh">
 <link rel="next" href="nm-initrd-generator.html" title="nm-initrd-generator">
-<meta name="generator" content="GTK-Doc V1.32.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.32 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -50,6 +50,13 @@
     and don't order them with respect to <code class="literal">network-online.target</code>
     at all.
     </p>
+<p>By default, connections have the <code class="literal">ipv4.may-fail</code> and
+    <code class="literal">ipv6.may-fail</code> properties set to <code class="literal">yes</code>;
+    this means that NetworkManager waits for one of the two address families to
+    complete configuration before considering the connection activated. If you
+    need a specific address family configured before
+    <code class="literal">network-online.target</code> is reached, set the corresponding
+    <code class="literal">may-fail</code> property to <code class="literal">no</code>.</p>
 </div>
 <div class="refsect1">
 <a name="options"></a><h2>Options</h2>
@@ -100,7 +107,8 @@
             <em class="replaceable"><code>seconds</code></em> 
         </span></p></td>
 <td><p>Time to wait for a connection, in seconds. If the option is not provided,
-          the default timeout is 30 seconds.</p></td>
+          the environment variable <code class="literal">NM_ONLINE_TIMEOUT</code> is honored.
+          The default timeout is 30 seconds.</p></td>
 </tr>
 <tr>
 <td><p><span class="term">  <code class="option">-x</code>  |   <code class="option">--exit</code>  </span></p></td>
@@ -141,6 +149,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.32.1</div>
+<hr>Generated by GTK-Doc V1.32</div>
 </body>
 </html>
\ No newline at end of file