diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-22 23:22:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 23:22:04 -0500 |
| commit | ee43050b40628368f938b6f366b4a6e94ea898a1 (patch) | |
| tree | c2d2098c5dd0bb2f84b31153f0260e72d2a6d7c2 /man | |
| parent | 6d9e45e97fb1157d5670d533f55819a59e7ae336 (diff) | |
| parent | ef8b0084552e05f28b9132d5dfc75edae164a991 (diff) | |
| download | systemd-ee43050b40628368f938b6f366b4a6e94ea898a1.tar.gz | |
Merge pull request #4692 from poettering/networkd-dhcp
Various networkd/DHCP fixes.
Diffstat (limited to 'man')
| -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> |