mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-08 21:17:47 +03:00
journald-remote,journal-upload: Support .d directories in the usual search paths
This commit is contained in:
parent
be795898c0
commit
bf257aed05
@ -1131,10 +1131,10 @@ static int parse_config(void) {
|
||||
{ "Remote", "TrustedCertificateFile", config_parse_path, 0, &arg_trust },
|
||||
{}};
|
||||
|
||||
return config_parse(NULL, PKGSYSCONFDIR "/journal-remote.conf", NULL,
|
||||
"Remote\0",
|
||||
config_item_table_lookup, items,
|
||||
false, false, true, NULL);
|
||||
return config_parse_many(PKGSYSCONFDIR "/journal-remote.conf",
|
||||
CONF_DIRS_NULSTR("systemd/journal-remote.conf"),
|
||||
"Remote\0", config_item_table_lookup, items,
|
||||
false, NULL);
|
||||
}
|
||||
|
||||
static void help(void) {
|
||||
|
@ -532,10 +532,10 @@ static int parse_config(void) {
|
||||
{ "Upload", "TrustedCertificateFile", config_parse_path, 0, &arg_trust },
|
||||
{}};
|
||||
|
||||
return config_parse(NULL, PKGSYSCONFDIR "/journal-upload.conf", NULL,
|
||||
"Upload\0",
|
||||
config_item_table_lookup, items,
|
||||
false, false, true, NULL);
|
||||
return config_parse_many(PKGSYSCONFDIR "/journal-upload.conf",
|
||||
CONF_DIRS_NULSTR("systemd/journal-upload.conf"),
|
||||
"Upload\0", config_item_table_lookup, items,
|
||||
false, NULL);
|
||||
}
|
||||
|
||||
static void help(void) {
|
||||
|
Loading…
Reference in New Issue
Block a user