fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 07:10:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns-manager: add dns=none

Browse source 
Add a new dns mode "none", meaning that NM should not modify
resolv.conf at all.

https://bugzilla.gnome.org/show_bug.cgi?id=690404
This commit is contained in:
Dan Winship 2013-03-26 10:05:25 -04:00
parent df1f4bee0e
commit 282a9720ab
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
man/NetworkManager.conf.5.in
View file

@ -151,6 +151,9 @@ connections.
NetworkManager will run 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.
.TP
.I none
NetworkManager will not modify resolv.conf.
.RE
.SS [keyfile]
This section contains keyfile-specific options and thus only has effect when using \fIkeyfile\fP plugin.

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

@ -61,6 +61,7 @@ typedef struct {
guint8 hash[HASH_LEN]; /* SHA1 hash of current DNS config */
guint8 prev_hash[HASH_LEN]; /* Hash when begin_updates() was called */
gboolean manage_dns;
NMDnsPlugin *plugin;
gboolean dns_touched;
@ -575,6 +576,9 @@ update_dns (NMDnsManager *self,
priv = NM_DNS_MANAGER_GET_PRIVATE (self);
if (!priv->manage_dns)
return TRUE;
priv->dns_touched = TRUE;
nm_log_dbg (LOGD_DNS, "updating resolv.conf");
@ -1055,10 +1059,16 @@ nm_dns_manager_init (NMDnsManager *self)
compute_hash (self, NM_DNS_MANAGER_GET_PRIVATE (self)->hash);
mode = nm_config_get_dns_mode (nm_config_get ());
if (!g_strcmp0 (mode, "dnsmasq"))
priv->plugin = nm_dns_dnsmasq_new ();
else if (mode && g_strcmp0 (mode, "default") != 0)
nm_log_warn (LOGD_DNS, "Unknown DNS mode '%s'", mode);
if (!g_strcmp0 (mode, "none")) {
priv->manage_dns = FALSE;
nm_log_info (LOGD_DNS, "DNS: not managing " _PATH_RESCONF);
} else {
priv->manage_dns = TRUE;
if (!g_strcmp0 (mode, "dnsmasq"))
priv->plugin = nm_dns_dnsmasq_new ();
else if (mode && g_strcmp0 (mode, "default") != 0)
nm_log_warn (LOGD_DNS, "Unknown DNS mode '%s'", mode);
}
if (priv->plugin) {
nm_log_info (LOGD_DNS, "DNS: loaded plugin %s", nm_dns_plugin_get_name (priv->plugin));