diff --git a/man/rules/meson.build b/man/rules/meson.build index 84b911b3659..71e0203721d 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -612,7 +612,7 @@ manpages = [ 'ENABLE_RANDOMSEED'], ['systemd-rc-local-generator', '8', [], ''], ['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''], - ['systemd-resolve', '1', [], 'ENABLE_RESOLVE'], + ['systemd-resolve', '1', ['resolvconf'], 'ENABLE_RESOLVE'], ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'], ['systemd-rfkill.service', '8', diff --git a/man/systemd-resolve.xml b/man/systemd-resolve.xml index fd5e35954a4..0c26102c058 100644 --- a/man/systemd-resolve.xml +++ b/man/systemd-resolve.xml @@ -47,7 +47,8 @@ systemd-resolve - Resolve domain names, IPV4 and IPv6 addresses, DNS resource records, and services + resolvconf + Resolve domain names, IPV4 and IPv6 addresses, DNS resource records, and services; introspect and reconfigure the DNS resolver @@ -134,6 +135,18 @@ --revert + + resolvconf + OPTIONS + -a INTERFACE < FILE + + + + resolvconf + OPTIONS + -d INTERFACE + + @@ -399,6 +412,82 @@ + + Compatibility with <citerefentry><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry> + + systemd-resolve is a multi-call binary. When invoked as resolvconf + (generally achieved by means of a symbolic link of this name to the systemd-resolve binary) it + 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 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: + + + + + Registers per-interface DNS configuration data with + systemd-resolved. Expects a network interface name as only command line argument. Reads + resolv.conf5 compatible DNS + configuration data from its standard input. Relevant fields are nameserver and + domain/search. This command is mostly identical to invoking + systemd-resolve with a combination of and + . + + + + + Unregisters per-interface DNS configuration data with systemd-resolved. This + command is mostly identical to invoking systemd-resolve with + . + + + + + + When specified and will not complain about missing + network interfaces and will silently execute no operation in that case. + + + + + + This switch for "exclusive" operation is supported only partially. It is mapped to an + additional configured search domain of ~. — i.e. ensures that DNS traffic is preferably + routed to the DNS servers on this interface, unless there are other, more specific domains configured on other + interfaces. + + + + + + + These switches are not supported and are silently ignored. + + + + + + + + + + + + + + + + These switches are not supported and the command will fail if used. + + + + + See resolvconf8 for details on this command line options. + + Examples @@ -477,7 +566,8 @@ _443._tcp.fedoraproject.org IN TLSA 0 0 1 19400be5b7a31fb733917700789d2f0a2471c0 systemd1, systemd-resolved.service8, systemd.dnssd5, - systemd-networkd.service8 + systemd-networkd.service8, + resolvconf8