diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-11-18 17:31:49 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-11-21 22:58:27 +0100 |
| commit | 640be8806e1ce366b9046a4828889515c98b72f9 (patch) | |
| tree | e1f3b508a845910898c532212dd21ef3f3535d3b /man/nss-resolve.xml | |
| parent | d9ec2e632df4905201facf76d6a205edc952116a (diff) | |
| download | systemd-640be8806e1ce366b9046a4828889515c98b72f9.tar.gz | |
man: make /etc/nsswitch.conf documentation for nss-resolve match example
Fixes: #4683
Diffstat (limited to 'man/nss-resolve.xml')
| -rw-r--r-- | man/nss-resolve.xml | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml index 9f24f65019..4e102cec26 100644 --- a/man/nss-resolve.xml +++ b/man/nss-resolve.xml @@ -63,16 +63,13 @@ hostnames via DNS.</para> <para>To activate the NSS module, add <literal>resolve</literal> to the line starting with - <literal>hosts:</literal> in <filename>/etc/nsswitch.conf</filename>.</para> - - <para>It is recommended to place <literal>resolve</literal> early in <filename>/etc/nsswitch.conf</filename>' - <literal>hosts:</literal> line (but after the <literal>files</literal> or <literal>mymachines</literal> entries), - replacing the <literal>dns</literal> entry if it exists, to ensure DNS queries are always routed via - <citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> - - <para>Note that <command>nss-resolve</command> will chain-load <command>nss-dns</command> if - <filename>systemd-resolved.service</filename> is not running, ensuring that basic DNS resolution continues to work - if the service is down.</para> + <literal>hosts:</literal> in <filename>/etc/nsswitch.conf</filename>. Specifcally, it is recommended to place + <literal>resolve</literal> early in <filename>/etc/nsswitch.conf</filename>' <literal>hosts:</literal> line (but + after the <literal>files</literal> or <literal>mymachines</literal> entries), right before the + <literal>dns</literal> entry if it exists, followed by <literal>[!UNAVAIL=return]</literal>, to ensure DNS queries + are always routed via + <citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry> if it is + running, but are routed to <command>nss-dns</command> if this service is not available.</para> </refsect1> <refsect1> @@ -94,9 +91,6 @@ ethers: db files rpc: db files netgroup: nis</programlisting> - - <para>This keeps the <command>dns</command> module as a fallback for cases where the <command>nss-resolve</command> - module is not installed.</para> </refsect1> <refsect1> |