summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Giudici <fgiudici@redhat.com>2017-03-07 10:27:58 +0100
committerFrancesco Giudici <fgiudici@redhat.com>2017-03-24 15:18:09 +0100
commit70c768901b66cd14188c4def5470cd16b91c40ae (patch)
treee41fae7c721bbea71576d93d1eb149e2231f57d6
parent76b2e9542fd64d226f98c71972749babc5dd7391 (diff)
downloadNetworkManager-70c768901b66cd14188c4def5470cd16b91c40ae.tar.gz
man: add description for the 'hostname' config option in the main sectionfg/keep_externally_set_hostname-rh1422610
-rw-r--r--man/NetworkManager.conf.xml28
1 files changed, 28 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 251a2a36b6..1230347d83 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -277,6 +277,34 @@ no-auto-default=*
</varlistentry>
<varlistentry>
+ <term><varname>hostname-mode</varname></term>
+ <listitem>
+ <para>
+ Set the management mode of the hostname. This parameter will
+ affect only the transient hostname. If a valid static hostname is set,
+ NetworkManager will skip the update of the hostname despite the value of
+ this option. An hostname empty or equal to 'localhost', 'localhost6',
+ 'localhost.localdomain' or 'localhost6.localdomain' is considered invalid.
+ </para>
+ <para><literal>default</literal>: NetworkManager will update the hostname
+ with the one provided via DHCP on the main connection (the one with a default
+ route). If not present, the hostname will be updated to the last one set
+ outside NetworkManager. If it is not valid, NetworkManager will try to recover
+ the hostname from the reverse lookup of the IP address of the main connection.
+ If this fails too, the hostname will be set to 'localhost.localdomain'.
+ </para>
+ <para><literal>dhcp</literal>: NetworkManager will update the transient hostname
+ only with information coming from DHCP. No fallback nor reverse lookup will be
+ performed, but when the dhcp connection providing the hostname is deactivated,
+ the hostname is reset to the last hostname set outside NetworkManager or
+ 'localhost' if none valid is there.
+ </para>
+ <para><literal>none</literal>: NetworkManager will not manage the transient
+ hostname and will never set it.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><varname>dns</varname></term>
<listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.
If the key is unspecified, <literal>default</literal> is used,