diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-11-24 21:12:51 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-25 21:58:38 +0100 |
| commit | a51c10485af349eb15faa4d1a63b9818bcf3e589 (patch) | |
| tree | 86134465451ab8044208710c2c5018171100555d /man | |
| parent | 0b58db658b5c3f586ac3a837427f1f7fec2abb2e (diff) | |
resolved: add a generic DnsSearchDomain concept
With this change, we add a new object to resolved, "DnsSearchDomain="
which wraps a search domain. This is then used to introduce a global
search domain list, in addition to the existing per-link search domain
list which is reword to make use of this new object too.
This is preparation for implement proper unicast DNS search domain
support.
Diffstat (limited to 'man')
| -rw-r--r-- | man/resolved.conf.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml index c9034a979f..4680b6a4e5 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -1,4 +1,4 @@ -<?xml version='1.0'?> <!--*-nxml-*--> +<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> @@ -77,7 +77,7 @@ sent to one of the listed DNS servers in parallel to any per-interface DNS servers acquired from <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. - For compatibility reasons, if this setting is not specified, , + For compatibility reasons, if this setting is not specified, the DNS servers listed in <filename>/etc/resolv.conf</filename> are used instead, if that file exists and any servers are configured in it. This @@ -99,6 +99,16 @@ </varlistentry> <varlistentry> + <term><varname>Domains=</varname></term> + <listitem><para>A space-separated list of search domains. For + compatibility reasons, if this setting is not specified, the + search domains listed in <filename>/etc/resolv.conf</filename> + are used instead, if that file exists and any domains are + configured in it. This setting defaults to the empty + list.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>LLMNR=</varname></term> <listitem><para>Takes a boolean argument or <literal>resolve</literal>. Controls Link-Local Multicast Name |