From 9eba2b0e7dd51d45c2fb260cbdd86955c8f9938c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 10 Mar 2015 15:30:02 -0500 Subject: [PATCH] man: note that dhcp=internal is required for configure-and-quit=true (cherry picked from commit cb17be1e12fe55038185ccaa053a2fa799e4259c) --- man/NetworkManager.conf.xml.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in index d9d51b846a..aea0a9a32a 100644 --- a/man/NetworkManager.conf.xml.in +++ b/man/NetworkManager.conf.xml.in @@ -209,7 +209,7 @@ Copyright 2010 - 2014 Red Hat, Inc. configure-and-quit - When set to true, NetworkManager quits after + When set to 'true', 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 @@ -219,10 +219,12 @@ Copyright 2010 - 2014 Red Hat, Inc. 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 false, 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 'dhcp' option + must be set to 'internal'. The default value of + the 'configure-and-quit' option is + 'false', meaning that NetworkManager will continue + running after initial network configuration and continue responding + to system and hardware events, D-Bus requests, and user commands.