diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-10 21:01:35 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-10 21:01:35 +0100 |
| commit | e3c4a681db0b7004904b95d55fd1a443161c9397 (patch) | |
| tree | a5b08abba6a533a3c4fc2a8f1bb9097957580c46 /src/resolve | |
| parent | 092b6e188b6b75be4450c6f20fc82599dcaf9552 (diff) | |
| parent | de7399eb7427da46c5cd355181080274f69567a2 (diff) | |
Merge pull request #1835 from poettering/grabbag-of-stuff
Lots of small fixes
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/resolved-conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c index de1bd26174..9207719551 100644 --- a/src/resolve/resolved-conf.c +++ b/src/resolve/resolved-conf.c @@ -150,8 +150,8 @@ int config_parse_support( int manager_parse_config_file(Manager *m) { assert(m); - return config_parse_many("/etc/systemd/resolved.conf", - CONF_DIRS_NULSTR("systemd/resolved.conf"), + return config_parse_many(PKGSYSCONFDIR "/resolved.conf", + CONF_PATHS_NULSTR("systemd/resolved.conf.d"), "Resolve\0", config_item_perf_lookup, resolved_gperf_lookup, false, m); |