X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fresolved.conf.xml;h=36013a5e3a2de333560760f275357c3d39dd38ce;hb=d3d3208f607693b8fde5226efa0cc15ec17670a0;hp=04e510fbe38e840f11a7c1c6107679f71c378cdf;hpb=091a364c802e34a58f3260c9cb5db9b75c62215c;p=elogind.git
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 04e510fbe..36013a5e3 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -22,7 +22,8 @@
along with systemd; If not, see .
-->
-
+
resolved.conf
systemd
@@ -44,23 +45,28 @@
resolved.conf
- Network Name Resolution configuration file
+ resolved.conf.d
+ Network Name Resolution configuration files
/etc/systemd/resolved.conf
+ /etc/systemd/resolved.conf.d/*.conf
+ /run/systemd/resolved.conf.d/*.conf
+ /usr/lib/systemd/resolved.conf.d/*.conf
Description
- When starting, systemd-resolved will read the
- configuration file resolved.conf.
- This configuration file determines the fallback DNS
- servers.
+ These configuration files control local DNS and LLMNR
+ name resolving.
+
+
+
Options
@@ -68,12 +74,62 @@
DNS=
- A space separated list of IPv4 and IPv6
- addresses to be used as the fallback DNS servers. Note that
- the servers obtained from
+ A space separated list
+ of IPv4 and IPv6 addresses to be used
+ as system DNS servers. DNS requests
+ are sent to one of the listed DNS
+ servers in parallel to any
+ per-interface DNS servers acquired
+ from
+ systemd-networkd.service8. For
+ compatibility reasons, if set to the
+ empty list the DNS servers listed in
+ /etc/resolv.conf
+ are used, if any are
+ configured there. This setting
+ defaults to the empty
+ list.
+
+
+
+ FallbackDNS=
+ A space separated list
+ of IPv4 and IPv6 addresses to be used
+ as the fallback DNS servers. Any
+ per-interface DNS servers obtained
+ from
+ systemd-networkd.service8
+ take precedence over this setting, as
+ do any servers set via
+ DNS= above or
+ /etc/resolv.conf. This
+ setting is hence only used if no other
+ DNS server information is known. If
+ this option is not given, a
+ compiled-in list of DNS servers is
+ used instead.
+
+
+
+ LLMNR=
+ Takes a boolean
+ argument or
+ resolve. Controls
+ Link-Local Multicast Name Resolution support (RFC
+ 4794) on the local host. If
+ true enables full LLMNR responder and
+ resolver support. If false disable
+ both. If set to
+ resolve only
+ resolving support is enabled, but
+ responding is disabled. Note that
systemd-networkd.service8
- take precedence. If this option is not given, a compiled-in
- list of DNS servers is used instead.
+ also maintains per-interface LLMNR
+ settings. LLMNR will be enabled on an
+ interface only if the per-interface
+ and the global setting is
+ on.
@@ -84,7 +140,8 @@
systemd1,
systemd-resolved.service8,
- systemd-networkd.service8
+ systemd-networkd.service8,
+ resolv.conf4