diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-01-25 18:30:43 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-03-07 18:49:44 +0100 |
| commit | e5abff372d028d28d50165358cd48b624cd0c2d2 (patch) | |
| tree | deff5a7ab41edcf31dedd391c90f19bc3650c6d0 /src/resolve | |
| parent | constants: drop duplicated CONF_PATHS defines (diff) | |
| download | systemd-e5abff372d028d28d50165358cd48b624cd0c2d2.tar.xz systemd-e5abff372d028d28d50165358cd48b624cd0c2d2.zip | |
shared/conf-parser: collapse pkgdir and conf_file args into one
This essentially reverts 5656cdfeeabc16b5489f5ec7a0a36025a2ec1f23. I find it
much easier to understand what is going on when the
path-relative-to-the-search-path is passed in full, instead of being constructed
from two parts, with one of the parts being implicit in some places.
Also, we call 'systemd-analyze cat-config <path>' with <path> with the same
meaning, so this makes the internal and external APIs more consistent.
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/resolved-conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c index 182ac20c3f..f88f295437 100644 --- a/src/resolve/resolved-conf.c +++ b/src/resolve/resolved-conf.c @@ -570,7 +570,7 @@ int manager_parse_config_file(Manager *m) { assert(m); - r = config_parse_config_file("resolved.conf", "Resolve\0", + r = config_parse_config_file("systemd/resolved.conf", "Resolve\0", config_item_perf_lookup, resolved_gperf_lookup, CONFIG_PARSE_WARN, m); if (r < 0) |