diff options
author | Jiří Klimeš <jklimes@redhat.com> | 2014-05-23 13:24:15 +0200 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2014-11-07 12:18:33 -0600 |
commit | 9ff8c01d4aa0efe3ad943b1f10b61477d2658e0a (patch) | |
tree | 1eca97161735809c42e311d0e12d9b506e23dfc4 | |
parent | a01e2ff91d3233526ce359d65be73c098573adfb (diff) | |
download | NetworkManager-9ff8c01d4aa0efe3ad943b1f10b61477d2658e0a.tar.gz |
man: document 'configure-and-quit' configuration option
-rw-r--r-- | man/NetworkManager.conf.xml.in | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in index 67919cfb4f..4fb8f502c0 100644 --- a/man/NetworkManager.conf.xml.in +++ b/man/NetworkManager.conf.xml.in @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- -Copyright (C) 2010 - 2013 Red Hat, Inc. +Copyright 2010 - 2014 Red Hat, Inc. --> <refentry id="NetworkManager.conf"> @@ -200,6 +200,28 @@ Copyright (C) 2010 - 2013 Red Hat, Inc. </varlistentry> <varlistentry> + <term><varname>configure-and-quit</varname></term> + <listitem> + <para> + 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 + desirable to save process time but still handle some dynamic + configurations. When this option is <literal>true</literal>, + network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE + 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. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><varname>dns</varname></term> <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para> <para><literal>default</literal>: The default if the key is |