Merge pull request #30480 from keszybz/kernel-install-more-paths

[thirdparty/systemd.git] / src / journal-remote / journal-upload.c

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 50fa31a1330ad11b5fd927b5b5662704c064dae1..1198791ed121f6d02929a94bca6e5868289b03a2 100644 (file)
--- 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) {