picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

resolved: Support resolved.conf.d directories in the usual search paths

Browse source
This commit is contained in:
Josh Triplett 2014-11-29 01:07:11 -08:00 committed by Zbigniew Jędrzejewski-Szmek
parent 301af7e485
commit f2dacc96b2
4 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile-man.am
View file

@ -1204,8 +1204,13 @@ MANPAGES += \
man/resolved.conf.5 \
man/systemd-resolved.service.8
MANPAGES_ALIAS += \
man/resolved.conf.d.5 \
man/systemd-resolved.8
man/resolved.conf.d.5: man/resolved.conf.5
man/systemd-resolved.8: man/systemd-resolved.service.8
man/resolved.conf.d.html: man/resolved.conf.html
$(html-alias)
man/systemd-resolved.html: man/systemd-resolved.service.html
$(html-alias)

16
man/resolved.conf.xml
View file

@ -22,7 +22,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
<refentry id="resolved.conf" conditional='ENABLE_RESOLVED'>
<refentry id="resolved.conf" conditional='ENABLE_RESOLVED'
xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>resolved.conf</title>
<productname>systemd</productname>
@ -44,23 +45,28 @@
<refnamediv>
<refname>resolved.conf</refname>
<refpurpose>Network Name Resolution configuration file</refpurpose>
<refname>resolved.conf.d</refname>
<refpurpose>Network Name Resolution configuration files</refpurpose>
</refnamediv>
<refsynopsisdiv>
<para><filename>/etc/systemd/resolved.conf</filename></para>
<para><filename>/etc/systemd/resolved.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/resolved.conf.d/*.conf</filename></para>
<para><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
<para>When starting, systemd-resolved will read the
configuration file <filename>resolved.conf</filename>.
This configuration file controls local DNS and LLMNR
<para>These configuration files control local DNS and LLMNR
name resolving.</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<refsect1>
<title>Options</title>

9
src/resolve/resolved-conf.c
View file

@ -147,8 +147,9 @@ int config_parse_support(
int manager_parse_config_file(Manager *m) {
assert(m);
return config_parse(NULL, "/etc/systemd/resolved.conf", NULL,
"Resolve\0",
config_item_perf_lookup, resolved_gperf_lookup,
false, false, true, m);
return config_parse_many("/etc/systemd/resolved.conf",
CONF_DIRS_NULSTR("systemd/resolved.conf"),
"Resolve\0",
config_item_perf_lookup, resolved_gperf_lookup,
false, m);
}

3
src/resolve/resolved.conf.in
View file

@ -5,6 +5,9 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# You can override the directives in this file by creating files in
# /etc/systemd/resolved.conf.d/*.conf.
#
# See resolved.conf(5) for details
[Resolve]