X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftmpfiles.c;h=4394f0dd55f56ee8e16dda964e148c7aa4d8626c;hb=b8590c197deceab623d37dbb95e30eec9cf47d14;hp=1574a199fbf3ab50e54e01b4adf2766b9f136913;hpb=772f83719e3c2262d948a4c4e70fe9babc4c4610;p=elogind.git

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 1574a199f..4394f0dd5 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -963,11 +963,17 @@ int main(int argc, char *argv[]) {
         } else {
                 char **files, **f;
 
-                files = conf_files_list(".conf",
-                                        "/run/tmpfiles.d",
-                                        "/etc/tmpfiles.d",
-                                        "/usr/lib/tmpfiles.d",
-                                        NULL);
+                r = conf_files_list(&files, ".conf",
+                                    "/run/tmpfiles.d",
+                                    "/etc/tmpfiles.d",
+                                    "/usr/local/lib/tmpfiles.d",
+                                    "/usr/lib/tmpfiles.d",
+                                    NULL);
+                if (r < 0) {
+                        r = EXIT_FAILURE;
+                        log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r));
+                        goto finish;
+                }
 
                 STRV_FOREACH(f, files) {
                         if (read_config_file(*f, true) < 0)
@@ -977,15 +983,11 @@ int main(int argc, char *argv[]) {
                 strv_free(files);
         }
 
-
-
         HASHMAP_FOREACH(i, globs, iterator)
-                if (process_item(i) < 0)
-                        r = EXIT_FAILURE;
+                process_item(i);
 
         HASHMAP_FOREACH(i, items, iterator)
-                if (process_item(i) < 0)
-                        r = EXIT_FAILURE;
+                process_item(i);
 
 finish:
         while ((i = hashmap_steal_first(items)))