summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-11-29 01:07:11 -0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-29 13:55:32 -0500
commitf2dacc96b25528ca1b0caca6364a69d656cf1569 (patch)
tree9830f1b716a73f6c3845032e019d3384e6f57fba /src
parent301af7e4853ad0281402f8d86f5a77c6cb7ce9f4 (diff)
resolved: Support resolved.conf.d directories in the usual search paths
Diffstat (limited to 'src')
-rw-r--r--src/resolve/resolved-conf.c9
-rw-r--r--src/resolve/resolved.conf.in3
2 files changed, 8 insertions, 4 deletions
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 63e87f8df5..81b9d3438c 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -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);
}
diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in
index c8263d67f4..e5a19ee474 100644
--- a/src/resolve/resolved.conf.in
+++ b/src/resolve/resolved.conf.in
@@ -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]