From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Jul 2019 16:41:14 +0000 (+0200)
Subject: tmpfiles: fix build
X-Git-Tag: v243-rc1~147^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d34cd5711df75490a2d8bc34a2937e5ea12d1693;p=thirdparty%2Fsystemd.git

tmpfiles: fix build

After I merged #12750 we don't build anymore, since the merged PR (which
passed CI) uses prefix_root() which doesn't exist anymore. Let's fix
that.
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 02eecf3e3af..b968d835a67 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -2625,7 +2625,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, bool
                 } else if (arg_root) {
                         char *p;
 
-                        p = prefix_root(arg_root, i.argument);
+                        p = path_join(arg_root, i.argument);
                         if (!p)
                                 return log_oom();
                         free_and_replace(i.argument, p);