diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-03-08 08:25:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-08 08:25:07 +0100 |
| commit | ec596fe34e731fa8c1772b8c1e3a7762be0f4665 (patch) | |
| tree | 33fe53d931e3f5fa74fc1e054226945b90fbb907 /src/journal-remote | |
| parent | resolved: don't cache NXDOMAIN for SUDN resolver.arpa (diff) | |
| parent | shared/conf-parser: add two more annotations (diff) | |
| download | systemd-ec596fe34e731fa8c1772b8c1e3a7762be0f4665.tar.xz systemd-ec596fe34e731fa8c1772b8c1e3a7762be0f4665.zip | |
Merge pull request #30480 from keszybz/kernel-install-more-paths
Read kernel-install config from /run/kernel too
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-remote-main.c | 9 | ||||
| -rw-r--r-- | src/journal-remote/journal-upload.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 7431403e4b..74bf6cfcc8 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -746,9 +746,12 @@ static int parse_config(void) { {} }; - return config_parse_config_file("journal-remote.conf", "Remote\0", - config_item_table_lookup, items, - CONFIG_PARSE_WARN, NULL); + return config_parse_standard_file_with_dropins( + "systemd/journal-remote.conf", + "Remote\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, + /* userdata= */ NULL); } static int help(void) { diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 50fa31a133..1198791ed1 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -531,9 +531,12 @@ static int parse_config(void) { {} }; - return config_parse_config_file("journal-upload.conf", "Upload\0", - config_item_table_lookup, items, - CONFIG_PARSE_WARN, NULL); + return config_parse_standard_file_with_dropins( + "systemd/journal-upload.conf", + "Upload\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, + /* userdata= */ NULL); } static int help(void) { |