From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Jul 2019 16:13:19 +0000 (+0200)
Subject: Merge pull request #12750 from keszybz/tmpfiles-c-copy
X-Git-Tag: v243-rc1~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c75f78e94c919d76e4f6e3d65abedba0e13e43f;p=thirdparty%2Fsystemd.git

Merge pull request #12750 from keszybz/tmpfiles-c-copy

Make tmpfiles C use --root
---

6c75f78e94c919d76e4f6e3d65abedba0e13e43f
diff --cc src/tmpfiles/tmpfiles.c
index ef817fca4f7,36ffd072b44..02eecf3e3af
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@@ -2710,10 -2744,9 +2719,9 @@@ static int parse_line(const char *fname
          if (arg_root) {
                  char *p;
  
 -                p = prefix_root(arg_root, i.path);
 +                p = path_join(arg_root, i.path);
                  if (!p)
                          return log_oom();
- 
                  free_and_replace(i.path, p);
          }