fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 22:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: add new rc-manager=unmanaged

Browse source 
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.

(cherry picked from commit 2789345d5b)
This commit is contained in:
Thomas Haller 2016-04-21 18:44:48 +02:00
parent 6ae3119f86
commit b952f54cb1
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
man/NetworkManager.conf.xml
View file

@ -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>

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

@ -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;
}