From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 22 Mar 2024 09:48:46 +0000 (+0100)
Subject: nspawn: Use dissect_image_mount_and_warn()
X-Git-Tag: v256-rc1~445^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50814ebede123a64d612fe6b6681a11bf27bd9be;p=thirdparty%2Fsystemd.git

nspawn: Use dissect_image_mount_and_warn()
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 3189c036395..3d0a9a73e3d 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3958,7 +3958,7 @@ static int outer_child(
 
         if (dissected_image) {
                 /* Now we know the uid shift, let's now mount everything else that might be in the image. */
-                r = dissected_image_mount(
+                r = dissected_image_mount_and_warn(
                                 dissected_image,
                                 directory,
                                 arg_uid_shift,
@@ -3967,10 +3967,8 @@ static int outer_child(
                                 determine_dissect_image_flags()|
                                 DISSECT_IMAGE_MOUNT_NON_ROOT_ONLY|
                                 (idmap ? DISSECT_IMAGE_MOUNT_IDMAPPED : 0));
-                if (r == -EUCLEAN)
-                        return log_error_errno(r, "File system check for image failed: %m");
                 if (r < 0)
-                        return log_error_errno(r, "Failed to mount image file system: %m");
+                        return r;
         }
 
         if (arg_unified_cgroup_hierarchy == CGROUP_UNIFIED_UNKNOWN) {