system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 18:24:38 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

repart: Use chase_symlinks() instead of path_join()

Browse source 
Let's properly resolve symlinks and check if the source actually
exists.
This commit is contained in:
Daan De Meyer 2022-10-03 10:09:24 +02:00 committed by Luca Boccassi
parent 8bd1dcc6e8
commit 898db9f3cf
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/partition/repart.c
View file

@ -3361,9 +3361,9 @@ static int partition_populate_directory(Partition *p, char **ret_root, char **re
if (strv_length(p->copy_files) == 2 && strv_length(p->make_directories) == 0 && streq(p->copy_files[1], "/")) {
_cleanup_free_ char *s = NULL;
s = path_join(arg_root, p->copy_files[0]);
if (!s)
return log_oom();
r = chase_symlinks(p->copy_files[0], arg_root, CHASE_PREFIX_ROOT|CHASE_WARN, &s, NULL);
if (r < 0)
return log_error_errno(r, "Failed to resolve source '%s%s': %m", strempty(arg_root), p->copy_files[0]);
*ret_root = TAKE_PTR(s);
*ret_tmp_root = NULL;