diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-04-21 18:44:48 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-04-26 13:58:28 +0200 |
| commit | 2789345d5b5047c67f93def77e581e076a252d74 (patch) | |
| tree | e5816e1508dda8161981de50ab8a1d64169a914d | |
| parent | 161f86b5b3f7165b843516b8f2eefac2768e245b (diff) | |
| download | NetworkManager-2789345d5b5047c67f93def77e581e076a252d74.tar.gz | |
dns: add new rc-manager=unmanaged
The following settings are effectively identical:
dns=none,rc-manager=*any*
dns=none,rc-manager=unmanaged
dns=default,rc-manager=unmanaged
The new setting is only there for completeness and only
makes sense for a dns plugin.
| -rw-r--r-- | man/NetworkManager.conf.xml | 5 | ||||
| -rw-r--r-- | src/dns-manager/nm-dns-manager.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 9735c56b81..95ff884c46 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -303,7 +303,8 @@ no-auto-default=* configuration with DNSSEC support. The /etc/resolv.conf will be managed by dnssec-trigger daemon.</para> <para><literal>none</literal>: NetworkManager will not - modify resolv.conf.</para> + modify resolv.conf. This implies <varname>rc-manager</varname> + <literal>unmanaged</literal></para> </listitem> </varlistentry> @@ -322,6 +323,8 @@ no-auto-default=* resolvconf to update the DNS configuration.</para> <para><literal>netconfig</literal>: NetworkManager will run netconfig to update the DNS configuration.</para> + <para><literal>unmanaged</literal>: don't touch + <filename>resolv.conf</filename>.</para> <para><literal>none</literal>: deprecated alias for <literal>symlink</literal>.</para> </listitem> diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 9478e9b579..9cb8a0f072 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -1470,6 +1470,8 @@ _get_resolv_conf_manager (NMConfig *config) return NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF; if (nm_streq (man, "netconfig")) return NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG; + if (nm_streq (man, "unmanaged")) + return NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED; return NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN; } |