diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-12-01 15:48:19 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-12-11 09:23:47 +0100 |
| commit | c7d88645111c90aaea418aad3f3c94398db59ed8 (patch) | |
| tree | 7cf329fe5b1558b4b1a572afda56a108c3b1a3c8 /man | |
| parent | df734a03bcb860344b5f25a24255617bb856af29 (diff) | |
connectivity: honor "main.systemd-resolved" setting to not resolve names first
If the user disabled systemd-resolved, two things seem apparent:
- the user does not want us to use systemd-resolved
- NetworkManager is not pushing the DNS configuration to
systemd-resoved.
It seems to me, we should not consult systemd-resolved in that case.
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager.conf.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 26de6f275a..65ebe013ad 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -402,11 +402,13 @@ no-auto-default=* <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> setting. You can keep this enabled 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> + <para>If systemd-resolved is enabled, the connectivity check resolves the + hostname per-device.</para> </listitem> </varlistentry> |