SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared/conf-parser: collapse pkgdir and conf_file args into one

Browse Source 
This essentially reverts 5656cdfeea. 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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2024-03-07 18:49:44 +01:00
parent 76d75d8b7b
commit e5abff372d
16 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journald-server.c
+4 -2
View File
@@ -1884,12 +1884,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
}
static int server_parse_config_file(Server *s) {
const char *conf_file = "journald.conf";
const char *conf_file;
assert(s);
if (s->namespace)
conf_file = strjoina("journald@", s->namespace, ".conf");
conf_file = strjoina("systemd/journald@", s->namespace, ".conf");
else
conf_file = "systemd/journald.conf";
return config_parse_config_file(conf_file, "Journal\0",
config_item_perf_lookup, journald_gperf_lookup,