colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

man: mark [main].dns=unbound as deprecated

Browse Source
This commit is contained in:
Thomas Haller
2021-06-01 13:53:41 +02:00
parent 4eeafaf654
commit 4a2fe09853
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
man/NetworkManager.conf.xml
View File

@@ -319,10 +319,12 @@ no-auto-default=*
<filename>/usr/lib/systemd/resolv.conf</filename>. <filename>/usr/lib/systemd/resolv.conf</filename>.
In that case, <literal>systemd-resolved</literal> is chosen automatically. In that case, <literal>systemd-resolved</literal> is chosen automatically.
</para> </para>
<para><literal>default</literal>: NetworkManager will update <para><literal>default</literal>: NetworkManager will update
<filename>/etc/resolv.conf</filename> to reflect the nameservers <filename>/etc/resolv.conf</filename> to reflect the nameservers
provided by currently active connections. The <literal>rc-manager</literal> provided by currently active connections. The <literal>rc-manager</literal>
setting (below) controls how this is done.</para> setting (below) controls how this is done.</para>
<para><literal>dnsmasq</literal>: NetworkManager will run <para><literal>dnsmasq</literal>: NetworkManager will run
dnsmasq as a local caching nameserver, using "Conditional Forwarding" dnsmasq as a local caching nameserver, using "Conditional Forwarding"
if you are connected to a VPN, and then update if you are connected to a VPN, and then update
@@ -336,12 +338,17 @@ no-auto-default=*
after some time. This behavior can be modified passing the after some time. This behavior can be modified passing the
'all-servers' or 'strict-order' options to dnsmasq (see the 'all-servers' or 'strict-order' options to dnsmasq (see the
manual page for more details).</para> manual page for more details).</para>
<para><literal>systemd-resolved</literal>: NetworkManager will <para><literal>systemd-resolved</literal>: NetworkManager will
push the DNS configuration to systemd-resolved</para> push the DNS configuration to systemd-resolved</para>
<para><literal>unbound</literal>: NetworkManager will talk <para><literal>unbound</literal>: NetworkManager will talk
to unbound and dnssec-triggerd, using "Conditional Forwarding" to unbound and dnssec-triggerd, using "Conditional Forwarding"
with DNSSEC support. <filename>/etc/resolv.conf</filename> with DNSSEC support. <filename>/etc/resolv.conf</filename>
will be managed by dnssec-trigger daemon.</para> will be managed by dnssec-trigger daemon. This option is
deprecated. Note that dnssec-trigger ships a NetworkManager dispatcher
script so this DNS plugin is not necessary.</para>
<para><literal>none</literal>: NetworkManager will not <para><literal>none</literal>: NetworkManager will not
modify resolv.conf. This implies modify resolv.conf. This implies
<literal>rc-manager</literal>&nbsp;<literal>unmanaged</literal></para> <literal>rc-manager</literal>&nbsp;<literal>unmanaged</literal></para>