From 58349c3885fec0ab43bbcff025ffa04b9e9b7b4b Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 20 Sep 2016 15:04:39 +0200 Subject: [PATCH] man: NetworkManager.conf: better document dns=dnsmasq 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. --- man/NetworkManager.conf.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 32ce5b477c..e3b90d541c 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -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 resolv.conf to point to the local - nameserver. + nameserver. It is possible to pass custom options to the + dnsmasq instance by adding them to files in the + "&sysconfdir;/NetworkManager/dnsmasq.d/" + 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). unbound: NetworkManager will talk to unbound and dnssec-triggerd, providing a "split DNS" configuration with DNSSEC support. The /etc/resolv.conf