From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Jul 2020 15:53:21 +0000 (+0200)
Subject: tmpfiles: properly prefix paths in debug outputs
X-Git-Tag: v247-rc1~441^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8e35011f726925d4c1640c5b721c18f7da9bd97;p=thirdparty%2Fsystemd.git

tmpfiles: properly prefix paths in debug outputs

This is otherwise very confusing...
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 6dad483d8c5..b4ffbeddf5a 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -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) {