From 924ccc35f95cabbcb475a659f4a2e2f4cd9ff7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 19 Apr 2020 22:01:21 +0200 Subject: [PATCH 1/3] man: add a note that resolvconf updates /etc/resolv.conf in specific circumstances When someone knows how the whole ecosystem works, this is understandable. But for someone coming from a system where resolvconf updates /etc/resolv.conf directly, this can be rather surprising. For https://bugzilla.redhat.com/show_bug.cgi?id=1815605. --- man/resolvectl.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/man/resolvectl.xml b/man/resolvectl.xml index 594e22c03f..4911980823 100644 --- a/man/resolvectl.xml +++ b/man/resolvectl.xml @@ -297,8 +297,16 @@ systemd-resolved.service8, similar to how and commands operate. Note that systemd-resolved.service is the only supported backend, which is different from other - implementations of this command. Note that not all operations supported by other implementations are supported - natively. Specifically: + implementations of this command. + + /etc/resolv.conf will only be updated with servers added with this command + when /etc/resolv.conf is a symlink to + /run/systemd/resolve/resolv.conf, and not a static file. See the discussion of + /etc/resolv.conf handling in + systemd-resolved.service8. + + + Not all operations supported by other implementations are supported natively. Specifically: From 42ecca2e6839aa4a36e335564461731ceee9180a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 20 Apr 2020 09:20:01 +0200 Subject: [PATCH 2/3] man: use manpages.ubuntu.com for resolvconf(8) link Add manpages.debian.org as a man citeref "project", so we can refer to man pages hosted there. resolvconf(8) doesn't seem to appear on any of the ones we currently have defined. We are doing a trick, where our man page is installed as resolvconf(1), and we refer the reader to resolvconf(8). This can be pretty confusing, so the least we can do is to provide a non-broken symlink ;) v2: - link to manpages.d.o instead of manpages.ubuntu.com, because debian is the upstream here, and because with debian we can use /unstable/ as the version, and ubuntu doesn't seem to have any such shortcut, so the version would need to be periodically updated. --- man/custom-html.xsl | 21 ++++++++++++++++----- man/resolvectl.xml | 10 +++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/man/custom-html.xsl b/man/custom-html.xsl index fccaf51ff5..7eebfdb5a1 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -1,9 +1,5 @@ - - + @@ -96,6 +92,21 @@ + + + + https://manpages.debian.org/unstable/ + + / + + . + + .en.html + + + + + diff --git a/man/resolvectl.xml b/man/resolvectl.xml index 4911980823..a7de5a309f 100644 --- a/man/resolvectl.xml +++ b/man/resolvectl.xml @@ -288,11 +288,13 @@ - Compatibility with <citerefentry><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry> + Compatibility with + <citerefentry project="debian"><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry> resolvectl is a multi-call binary. When invoked as resolvconf (generally achieved by means of a symbolic link of this name to the resolvectl binary) it - is run in a limited resolvconf8 + is run in a limited + resolvconf8 compatibility mode. It accepts mostly the same arguments and pushes all data into systemd-resolved.service8, similar to how and commands operate. Note that @@ -367,7 +369,9 @@ - See resolvconf8 for details on this command line options. + See + resolvconf8 + for details on those command line options. From 3d334c40b4f4d61288915b18ca7b8e4f49b2fae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 20 Apr 2020 12:16:56 +0200 Subject: [PATCH 3/3] resolved: fix minor confusion in comment Suffixing != prefixing. --- src/resolve/resolved-dns-scope.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index d7e7b5a853..d06e428011 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -496,9 +496,8 @@ DnsScopeMatch dns_scope_good_domain( assert(s); assert(domain); - /* Checks if the specified domain is something to look up on - * this scope. Note that this accepts non-qualified hostnames, - * i.e. those without any search path prefixed yet. */ + /* Checks if the specified domain is something to look up on this scope. Note that this accepts + * non-qualified hostnames, i.e. those without any search path suffixed. */ if (ifindex != 0 && (!s->link || s->link->ifindex != ifindex)) return DNS_SCOPE_NO;