system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-24 11:44:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

man: NetworkManager.conf: better document dns=dnsmasq

Browse source 
It's potentially unexpected by user that dnsmasq works differently
from the libc resolver and doesn't try the servers in order. Add a
paragraph to explain that and how to tweak the resolution order.
This commit is contained in:
Beniamino Galvani 2016-09-20 15:04:39 +02:00
parent b1bf2671b2
commit 58349c3885
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
man/NetworkManager.conf.xml
View file

@ -285,7 +285,15 @@ no-auto-default=*
dnsmasq as a local caching nameserver, using a "split DNS"
configuration if you are connected to a VPN, and then update
<filename>resolv.conf</filename> to point to the local
nameserver.</para>
nameserver. It is possible to pass custom options to the
dnsmasq instance by adding them to files in the
"<filename>&sysconfdir;/NetworkManager/dnsmasq.d/</filename>"
directory. Note that when multiple upstream servers are
available, dnsmasq will initially contact them in parallel and
then use the fastest to respond, probing again other servers
after some time. This behavior can be modified passing the
'all-servers' or 'strict-order' options to dnsmasq (see the
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 /etc/resolv.conf