]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #12750 from keszybz/tmpfiles-c-copy
authorLennart Poettering <lennart@poettering.net>
Thu, 11 Jul 2019 16:13:19 +0000 (18:13 +0200)
committerGitHub <noreply@github.com>
Thu, 11 Jul 2019 16:13:19 +0000 (18:13 +0200)
Make tmpfiles C use --root

1  2 
man/tmpfiles.d.xml
src/tmpfiles/tmpfiles.c

Simple merge
index ef817fca4f7024157003c39b7e17d403ad72573d,36ffd072b4475add024d02b9081dad4c339e08f0..02eecf3e3af0e8339a189e7de211cc602769376e
@@@ -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);
          }