From d34cd5711df75490a2d8bc34a2937e5ea12d1693 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 11 Jul 2019 18:41:14 +0200 Subject: [PATCH 1/2] 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. --- src/tmpfiles/tmpfiles.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 02eecf3e3a..b968d835a6 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); From a345cf448d1cac7fab79ca4a0a2f647664bdf83e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 11 Jul 2019 18:42:26 +0200 Subject: [PATCH 2/2] tmpfiles: use path_join() where it makes sense --- src/tmpfiles/tmpfiles.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index b968d835a6..90ba32ede0 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -2597,7 +2597,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, bool case CREATE_SYMLINK: if (!i.argument) { - i.argument = strappend("/usr/share/factory/", i.path); + i.argument = path_join("/usr/share/factory/", i.path); if (!i.argument) return log_oom(); }