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

dns: on quit only update resolv.conf if dns=dnsmasq

Browse source 
Previously we always updated resolv.conf on quit. When we are using
systemd-resolved the update is not necessary because the resolver on
127.0.0.53 would still be reachable after NM quits. Also, when NM
manages resolv.conf directly there is no need to update the file
again. Let's rewrite resolv.conf only when using dnsmasq.

https://bugzilla.redhat.com/show_bug.cgi?id=1541031
(cherry picked from commit 37eed6984b)
This commit is contained in:
Beniamino Galvani 2018-02-08 18:12:26 +01:00
parent 338b4e6b21
commit 1c27ee350d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dns/nm-dns-manager.c
View file

@ -1448,11 +1448,13 @@ nm_dns_manager_stop (NMDnsManager *self)
_LOGT ("stopping...");
/* If we're quitting, leave a valid resolv.conf in place, not one
* pointing to 127.0.0.1 if any plugins were active. Thus update
* DNS after disposing of all plugins. But if we haven't done any
* DNS updates yet, there's no reason to touch resolv.conf on shutdown.
* pointing to 127.0.0.1 if dnsmasq was active. But if we haven't
* done any DNS updates yet, there's no reason to touch resolv.conf
* on shutdown.
*/
if (priv->dns_touched) {
if ( priv->dns_touched
&& priv->plugin
&& NM_IS_DNS_DNSMASQ (priv->plugin)) {
if (!update_dns (self, TRUE, &error)) {
_LOGW ("could not commit DNS changes on shutdown: %s", error->message);
g_clear_error (&error);