diff options
Diffstat (limited to 'src/partition')
| -rw-r--r-- | src/partition/repart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/partition/repart.c b/src/partition/repart.c index f6b8c9be65..04cf66ec13 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -3721,6 +3721,10 @@ static int do_copy_files(Partition *p, const char *root, const Set *denylist) { if (pfd < 0) return log_error_errno(pfd, "Failed to open parent directory of target: %m"); + /* Make sure everything is owned by the user running repart so that + * make_filesystem() can map the user running repart to "root" in a user + * namespace to have the files owned by root in the final image. */ + r = copy_tree_at( sfd, ".", pfd, fn, @@ -3813,10 +3817,6 @@ static int partition_populate_directory(Partition *p, const Set *denylist, char if (fchmod(rfd, 0755) < 0) return log_error_errno(errno, "Failed to change mode of temporary directory: %m"); - /* Make sure everything is owned by the user running repart so that make_filesystem() can map the - * user running repart to "root" in a user namespace to have the files owned by root in the final - * image. */ - r = do_copy_files(p, root, denylist); if (r < 0) return r; |