diff options
| author | Frantisek Sumsal <fsumsal@redhat.com> | 2019-07-11 21:55:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 21:55:55 +0200 |
| commit | 4747b645c6690c058ca1c8353cd69d061f98cf4f (patch) | |
| tree | 38253e8fd38aa8b43de9f7a3ccff3008c37ee563 | |
| parent | Merge pull request #13017 from yuwata/network-neighbor-lladdr-13015 (diff) | |
| parent | tmpfiles: use path_join() where it makes sense (diff) | |
| download | systemd-4747b645c6690c058ca1c8353cd69d061f98cf4f.tar.xz systemd-4747b645c6690c058ca1c8353cd69d061f98cf4f.zip | |
Merge pull request #13025 from poettering/tmpfiles-fixo
unbreak the build
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 02eecf3e3a..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(); } @@ -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); |