]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: Use dissect_image_mount_and_warn() 31900/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 22 Mar 2024 09:48:46 +0000 (10:48 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 22 Mar 2024 09:48:46 +0000 (10:48 +0100)
src/nspawn/nspawn.c

index 3189c03639535eb92c2bd585204371273accecce..3d0a9a73e3d68d2f59a5d587f61587f2cc571e9d 100644 (file)
@@ -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) {