1
0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00

Merge pull request #13025 from poettering/tmpfiles-fixo

unbreak the build
This commit is contained in:
Frantisek Sumsal 2019-07-11 19:55:55 +00:00 committed by GitHub
commit 4747b645c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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);