diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-09-20 15:04:39 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-09-20 15:32:37 +0200 |
| commit | 58349c3885fec0ab43bbcff025ffa04b9e9b7b4b (patch) | |
| tree | aeae544fa63bb6a245eb42ca02d8e964bd2dd7fd | |
| parent | b1bf2671b237e0d31352f20798702da8db707205 (diff) | |
| download | NetworkManager-58349c3885fec0ab43bbcff025ffa04b9e9b7b4b.tar.gz | |
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.
| -rw-r--r-- | man/NetworkManager.conf.xml | 10 |
1 files changed, 9 insertions, 1 deletions
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 <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 |