diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-07-03 14:35:32 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-09-24 15:17:02 +0200 |
| commit | d4eb4cb45f41b1751cacf71da558bf8f0988f383 (patch) | |
| tree | ddb5f966034dfde118f7c97f46a50a3c545aca66 /man | |
| parent | ecde3e9034a2c9e0676381aa0df5a8125ec74bd5 (diff) | |
dns: allow loading nm-dns-systemd-resolve alongside other DNS plugins
Even when the system resolver is configured to something else that
systemd-resolved, it still is a good idea to keep systemd-resolved up to
date. If not anything else, it does a good job at doing per-interface
resolving for connectivity checks.
If for whatever reasons don't want NetworkManager to push the DNS data
it discovers to systemd-resolved, the functionality can be disabled
with:
[main]
systemd-resolved=false
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager.conf.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 6735af5fd4..1e1d0aab15 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -388,6 +388,20 @@ no-auto-default=* </varlistentry> <varlistentry> + <term><varname>systemd-resolved</varname></term> + <listitem><para>Send the connection DNS configuration to + <literal>systemd-resolved</literal>. Defaults to "<literal>true</literal>". + </para> + <para>Note that this setting is complementary to the + <varname>dns</varname> setting. You can keep this enable while using + <varname>dns</varname> set to another DNS plugin alongside + <literal>systemd-resolved</literal>, or <varname>dns</varname> set to + <literal>systemd-resolved</literal> to configure the system resolver to use + <literal>systemd-resolved</literal>.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><varname>debug</varname></term> <listitem><para>Comma separated list of options to aid debugging. This value will be combined with the environment |