diff options
| author | Daniel Mack <github@zonque.org> | 2015-08-28 08:54:19 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-08-28 08:54:19 +0200 |
| commit | 04b0752fb21e68295a6ef72f0503f81ed09a74b8 (patch) | |
| tree | 973cd817f6199e3621ad1662c72a51e59a5be0b9 /man | |
| parent | 933f08ad7f2c5e75bb7a773a48a7f5f0bbbe0aa9 (diff) | |
| parent | 437293cf805b0042fdcc0df165e9e5b3773fa1d7 (diff) | |
Merge pull request #1060 from poettering/resolved-man-2
man: Document that resolved requires nss-resolve to work with libc
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-resolved.service.xml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index 27662456ea..96dc4f6620 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -61,15 +61,22 @@ resolver and an LLMNR resolver and responder. It also generates <filename>/run/systemd/resolve/resolv.conf</filename> for compatibility which may be symlinked from - <filename>/etc/resolv.conf</filename>.</para> + <filename>/etc/resolv.conf</filename>. The glibc NSS module + <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry> + is necessary to allow libc's NSS resolver functions to resolve + host names via <command>systemd-resolved</command>.</para> <para>The DNS servers contacted are determined from the global - settings in - <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - the per-link static settings in <filename>.network</filename> - files, and the per-link dynamic settings received over DHCP. See + settings in <filename>/etc/systemd/resolved.conf</filename>, the + per-link static settings in <filename>/etc/systemd/network/*.network</filename> files, + and the per-link dynamic settings received over DHCP. See + <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + and <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for more details.</para> + for details. To improve compatibility + <filename>/etc/resolv.conf</filename> is read in order to discover + configured system DNS servers, however only if it is not a symlink + to <filename>/run/systemd/resolve/resolv.conf</filename> (see above).</para> <para><command>systemd-resolved</command> synthesizes DNS RRs for the following cases:</para> @@ -137,6 +144,7 @@ <para> <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> </para> |