From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Apr 2021 21:21:21 +0000 (+0200)
Subject: repart: prefix the correct path with root dir in log output
X-Git-Tag: v249-rc1~359^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=554a2b64934a1cc6815f2df126811271d5c0ac9d;p=thirdparty%2Fsystemd.git

repart: prefix the correct path with root dir in log output

When we copy files into the freshly formatted file system, the mount
point prefix must be prepended to the *target* path, not the *source*
path. Not just in code but in the log message about it, too.
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 3e88d382059..9e297f19b9a 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -2846,7 +2846,7 @@ static int do_copy_files(Partition *p, const char *fs) {
                                                 UID_INVALID, GID_INVALID,
                                                 COPY_REFLINK|COPY_MERGE|COPY_REPLACE|COPY_SIGINT|COPY_HARDLINKS);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to copy %s%s to %s: %m", strempty(arg_root), *source, *target);
+                                return log_error_errno(r, "Failed to copy '%s' to '%s%s': %m", *source, strempty(arg_root), *target);
                 } else {
                         /* We are looking at a regular file */
 
@@ -2864,7 +2864,7 @@ static int do_copy_files(Partition *p, const char *fs) {
 
                         r = copy_bytes(sfd, tfd, UINT64_MAX, COPY_REFLINK|COPY_SIGINT);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to copy '%s%s' to '%s': %m", strempty(arg_root), *source, *target);
+                                return log_error_errno(r, "Failed to copy '%s' to '%s%s': %m", *source, strempty(arg_root), *target);
 
                         (void) copy_xattr(sfd, tfd);
                         (void) copy_access(sfd, tfd);