fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 13:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

man: clarify dns=default setting in NetworkManager.conf manual

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=774399
This commit is contained in:
Thomas Haller 2016-11-14 12:32:11 +01:00
parent 34eb8d513f
commit ce28e6ab30
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
man/NetworkManager.conf.xml
View file

@ -278,13 +278,17 @@ no-auto-default=*
<varlistentry>
<term><varname>dns</varname></term>
<listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para>
<listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.
If the key is unspecified, <literal>default</literal> is used,
unless <filename>/etc/resolv.conf</filename> is a symlink to
<filename>/run/systemd/resolve/resolv.conf</filename>,
<filename>/lib/systemd/resolv.conf</filename> or
<filename>/usr/lib/systemd/resolv.conf</filename>.
In that case, <literal>systemd-resolved</literal> is chosen automatically.
</para>
<para><literal>default</literal>: NetworkManager will update
<filename>resolv.conf</filename> to reflect the nameservers
provided by currently active connections. This is the default
if the key is not specified, unless the system is configured
to use systemd-resolved; in this case the default is
<literal>systemd-resolved</literal></para>
<filename>/etc/resolv.conf</filename> to reflect the nameservers
provided by currently active connections.</para>
<para><literal>dnsmasq</literal>: NetworkManager will run
dnsmasq as a local caching nameserver, using a "split DNS"
configuration if you are connected to a VPN, and then update
@ -300,7 +304,7 @@ no-auto-default=*
manual page for more details).</para>
<para><literal>unbound</literal>: NetworkManager will talk
to unbound and dnssec-triggerd, providing a "split DNS"
configuration with DNSSEC support. The <filename>/etc/resolv.conf</filename>
configuration with DNSSEC support. <filename>/etc/resolv.conf</filename>
will be managed by dnssec-trigger daemon.</para>
<para><literal>systemd-resolved</literal>: NetworkManager will
push the DNS configuration to systemd-resolved</para>