summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-04-14 17:57:56 +0200
committerThomas Haller <thaller@redhat.com>2014-05-01 22:06:52 +0200
commit516d66210fbcc9897f60dc9145a477e91ff8bad5 (patch)
tree8f0ae504278bc6ae7cbfa48b6a48b354fbe68602 /man
parenta16faa3985042dadb34600cb0df2eefc61360340 (diff)
downloadNetworkManager-516d66210fbcc9897f60dc9145a477e91ff8bad5.tar.gz
core: wait with "startup complete" for both IPv4 and IPv6 dynamic configuration
In case of DHCP4, DHCP6 and/or SLAAC, delay "startup complete" until both IPv4 and IPv6 are ready. This especially has an effect on nm-online/NetworkManager-wait-online.service, which blocks until configuration of both IPv4 and IPv6 is ready. We queue a pending_action when automatic configuration starts and remove it again, when we receive an address. Before, "startup complete" was reached when either one of the two IP protocols was configured. https://bugzilla.redhat.com/show_bug.cgi?id=1086906 Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'man')
-rw-r--r--man/nm-online.1.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/man/nm-online.1.in b/man/nm-online.1.in
index ddb2b17f79..9546a2d4a0 100644
--- a/man/nm-online.1.in
+++ b/man/nm-online.1.in
@@ -35,7 +35,12 @@ is a utility to find out whether we are online. It is done by asking
NetworkManager about its status. When run, \fInm\-online\fP waits until
NetworkManager reports an active connection, or specified timeout expires. On
exit, the returned status code should be checked (see the return codes bellow).
-
+.P
+By default NetworkManager waits for IPv4 dynamic addressing to complete but does
+not wait for the "auto" IPv6 dynamic addressing. To wait for IPv6 addressing to
+complete, either (1) change the network connection's IPv6 "may-fail" setting to "no",
+and/or (2) change the IPv6 addressing method to "manual" or "dhcp", to indicate that
+IPv6 connectivity is expected.
.SH OPTIONS
.TP
.B \-t, \-\-timeout <timeout_value>