shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-14 09:44:38 +03:00
Code Activity

repart: Move comment

Browse Source
This commit is contained in:
Daan De Meyer
2022-11-23 10:26:33 +01:00
parent 3185360980
commit 8a050905a3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/partition/repart.c
View File

@@ -3721,6 +3721,10 @@ static int do_copy_files(Partition *p, const char *root, const Set *denylist) {
if (pfd < 0) if (pfd < 0)
return log_error_errno(pfd, "Failed to open parent directory of target: %m"); 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( r = copy_tree_at(
sfd, ".", sfd, ".",
pfd, fn, pfd, fn,
@@ -3813,10 +3817,6 @@ static int partition_populate_directory(Partition *p, const Set *denylist, char
if (fchmod(rfd, 0755) < 0) if (fchmod(rfd, 0755) < 0)
return log_error_errno(errno, "Failed to change mode of temporary directory: %m"); 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); r = do_copy_files(p, root, denylist);
if (r < 0) if (r < 0)
return r; return r;