diff options
| author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2012-02-29 11:13:55 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2012-03-01 18:00:03 -0600 |
| commit | 86a8fa4a79b953542644d55ed527446702787d03 (patch) | |
| tree | 6b4a0889bda74d2150783be3c706055ab1151a2a /src/dns-manager | |
| parent | 84ef2acdd00b3173dcb5af8edd41e8b60c569b41 (diff) | |
| download | NetworkManager-86a8fa4a79b953542644d55ed527446702787d03.tar.gz | |
dns: dnsmasq plugin: update command-line parameters for starting dnsmasq
Drop --strict-order; dnsmasq is intelligent enough to ask nameservers in
an order that makes the best of possibly slow nameservers (or broken ones),
and interrogating them in strict order breaks this.
Add --no-hosts: by default dnsmasq will read /etc/hosts as a list of things
to resolve statically; this is something we want to avoid as nsswitch.conf
already lists files as the first data store to look at; where the entries
in /etc/hosts will already have been returned if that's what the user wants
to see. If the /etc/hosts file then changes, dnsmasq would have to be restarted
before the user would get the new value resolved externally. Avoid this, let
/etc/hosts override DNS entries normally through the resolver and show
changes as soon as the file is updated.
Diffstat (limited to 'src/dns-manager')
| -rw-r--r-- | src/dns-manager/nm-dns-dnsmasq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index e44513be36..6314438122 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -302,7 +302,7 @@ update (NMDnsPlugin *plugin, argv[0] = find_dnsmasq (); argv[1] = "--no-resolv"; /* Use only commandline */ argv[2] = "--keep-in-foreground"; - argv[3] = "--strict-order"; + argv[3] = "--no-hosts"; /* don't use /etc/hosts to resolve */ argv[4] = "--bind-interfaces"; argv[5] = "--pid-file=" PIDFILE; argv[6] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */ |