diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-08-17 09:10:32 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-08-17 18:55:59 +0200 |
| commit | d296c20f1fff6a258cc6eacd2141058daa49a1ff (patch) | |
| tree | b21001e58291ec0aaa644cf09788de9101bdf130 /man/nss-resolve.xml | |
| parent | tools/make-man-index: fix purpose text that contains tags (diff) | |
| download | systemd-d296c20f1fff6a258cc6eacd2141058daa49a1ff.tar.xz systemd-d296c20f1fff6a258cc6eacd2141058daa49a1ff.zip | |
man: move 'files' module in NSS 'hosts:' line before myhostname
I am pretty sure /etc/hosts (i.e. an explicitly configured, local,
trusted database) should be useful for overriding the automatic
myhostname logic.
resolved's internal logic handles it that way and hence we should
suggest it in the NSS fallback line, too.
Let's also bring the factory file back into sync with what the docs say.
And update the prose a bit too, to actually match what we recommend.
Diffstat (limited to 'man/nss-resolve.xml')
| -rw-r--r-- | man/nss-resolve.xml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml index c377468953..e6963e5812 100644 --- a/man/nss-resolve.xml +++ b/man/nss-resolve.xml @@ -44,14 +44,12 @@ <literal>dns</literal> somewhere after <literal>resolve</literal>, to fall back to <command>nss-dns</command> if <filename>systemd-resolved.service</filename> is not available.</para> - <para>Note that <command>systemd-resolved</command> will synthesize DNS resource - records in a few cases, for example for <literal>localhost</literal> and the - current hostname, see - <citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry> - for the full list. This duplicates the functionality of - <citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - but it is still recommended (see examples below) to keep - <command>nss-myhostname</command> configured in + <para>Note that <command>systemd-resolved</command> will synthesize DNS resource records in a few cases, + for example for <literal>localhost</literal> and the current local hostname, see + <citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry> for + the full list. This duplicates the functionality of + <citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>8</manvolnum></citerefentry>, but + it is still recommended (see examples below) to keep <command>nss-myhostname</command> configured in <filename>/etc/nsswitch.conf</filename>, to keep those names resolveable if <command>systemd-resolved</command> is not running.</para> </refsect1> @@ -64,10 +62,10 @@ <!-- synchronize with other nss-* man pages and factory/etc/nsswitch.conf --> <programlisting>passwd: compat systemd -group: compat systemd +group: compat [SUCCESS=merge] systemd shadow: compat -hosts: mymachines <command>resolve [!UNAVAIL=return]</command> myhostname files dns +hosts: mymachines <command>resolve [!UNAVAIL=return]</command> files myhostname dns networks: files protocols: db files |