summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2015-03-10 15:30:02 -0500
committerDan Williams <dcbw@redhat.com>2015-03-10 15:30:02 -0500
commitcb17be1e12fe55038185ccaa053a2fa799e4259c (patch)
tree4027f9d4a519bbcb566b9dbf5892fefb25086ae6
parentfce2fa57a5b304876310744cbd65ace25ae41110 (diff)
downloadNetworkManager-cb17be1e12fe55038185ccaa053a2fa799e4259c.tar.gz
man: note that dhcp=internal is required for configure-and-quit=true
-rw-r--r--man/NetworkManager.conf.xml.in12
1 files changed, 7 insertions, 5 deletions
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index ecba844399..0fbf9d2e94 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -212,7 +212,7 @@ no-auto-default=*
<term><varname>configure-and-quit</varname></term>
<listitem>
<para>
- When set to <literal>true</literal>, NetworkManager quits after
+ When set to '<literal>true</literal>', NetworkManager quits after
performing initial network configuration but spawns small helpers
to preserve DHCP leases and IPv6 addresses. This is useful in
environments where network setup is more or less static or it is
@@ -222,10 +222,12 @@ no-auto-default=*
interfaces cannot be preserved due to their use of external
services, and these devices will be deconfigured when NetworkManager
quits even though other interface's configuration may be preserved.
- The default value is <literal>false</literal>, meaning that
- NetworkManager will continue running after initial network
- configuration and continue responding to system and hardware events,
- D-Bus requests, and user commands.
+ Also, to preserve DHCP addresses the '<literal>dhcp</literal>' option
+ must be set to '<literal>internal</literal>'. The default value of
+ the '<literal>configure-and-quit</literal>' option is
+ '<literal>false</literal>', meaning that NetworkManager will continue
+ running after initial network configuration and continue responding
+ to system and hardware events, D-Bus requests, and user commands.
</para>
</listitem>
</varlistentry>