diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-11-11 13:19:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-11 13:19:58 +0100 |
| commit | 46fddd8eb6797dcfe33aab24a65f0359eaa87cbf (patch) | |
| tree | dc6393d53d3d70f018ae4a701a9ce899c94abb8c /src/dissect | |
| parent | b27c8036014f87048405623380ab36afc6cdfd58 (diff) | |
| parent | bd69c2a85fd37a5e9ae3a5c9521840e439a9cdf2 (diff) | |
| download | systemd-46fddd8eb6797dcfe33aab24a65f0359eaa87cbf.tar.gz | |
Merge pull request #24803 from DaanDeMeyer/repart-copy-deny-list
repart: Don't descend into directories assigned to other partitions
Diffstat (limited to 'src/dissect')
| -rw-r--r-- | src/dissect/dissect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 1ee4119d4f..4ff86ba1de 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -1126,9 +1126,9 @@ static int action_list_or_mtree_or_copy(DissectedImage *m, LoopDevice *d) { if (errno != ENOENT) return log_error_errno(errno, "Failed to open destination '%s': %m", arg_target); - r = copy_tree_at(source_fd, ".", dfd, bn, UID_INVALID, GID_INVALID, COPY_REFLINK|COPY_REPLACE|COPY_SIGINT|COPY_HARDLINKS); + r = copy_tree_at(source_fd, ".", dfd, bn, UID_INVALID, GID_INVALID, COPY_REFLINK|COPY_REPLACE|COPY_SIGINT|COPY_HARDLINKS, NULL); } else - r = copy_tree_at(source_fd, ".", target_fd, ".", UID_INVALID, GID_INVALID, COPY_REFLINK|COPY_REPLACE|COPY_SIGINT|COPY_HARDLINKS); + r = copy_tree_at(source_fd, ".", target_fd, ".", UID_INVALID, GID_INVALID, COPY_REFLINK|COPY_REPLACE|COPY_SIGINT|COPY_HARDLINKS, NULL); if (r < 0) return log_error_errno(r, "Failed to copy '%s' to '%s' in image '%s': %m", arg_source, arg_target, arg_image); |