morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

journald-remote,journal-upload: Support .d directories in the usual search paths

Browse Source
This commit is contained in:
Josh Triplett
2014-11-29 01:07:28 -08:00
committed by Zbigniew Jędrzejewski-Szmek
parent be795898c0
commit bf257aed05
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/journal-remote/journal-remote.c
View File

@@ -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) {

8
src/journal-remote/journal-upload.c
View File

@@ -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) {