From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 23 Nov 2022 09:26:33 +0000 (+0100)
Subject: repart: Move comment
X-Git-Tag: v253-rc1~435^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a050905a30ff3a5108a8591130e27a1cb17b90c;p=thirdparty%2Fsystemd.git

repart: Move comment
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index f6b8c9be65f..04cf66ec139 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;