]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tmpfiles: properly prefix paths in debug outputs
authorLennart Poettering <lennart@poettering.net>
Tue, 28 Jul 2020 15:53:21 +0000 (17:53 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 5 Aug 2020 18:26:25 +0000 (20:26 +0200)
This is otherwise very confusing...

src/tmpfiles/tmpfiles.c

index 6dad483d8c5ff44547eecbce1dea2bf8b2c818b9..b4ffbeddf5a3a3f0fc65c387b401beea20ec6fad 100644 (file)
@@ -3276,10 +3276,20 @@ static int run(int argc, char *argv[]) {
 
         if (DEBUG_LOGGING) {
                 _cleanup_free_ char *t = NULL;
+                char **i;
 
-                t = strv_join(config_dirs, "\n\t");
-                if (t)
-                        log_debug("Looking for configuration files in (higher priority first):\n\t%s", t);
+                STRV_FOREACH(i, config_dirs) {
+                        _cleanup_free_ char *j = NULL;
+
+                        j = path_join(arg_root, *i);
+                        if (!j)
+                                return log_oom();
+
+                        if (!strextend(&t, "\n\t", j, NULL))
+                                return log_oom();
+                }
+
+                log_debug("Looking for configuration files in (higher priority first):%s", t);
         }
 
         if (arg_cat_config) {