From 7b87fe4c30c3a5492ba409ebb13b1a5505c00a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 21 Apr 2021 09:07:30 +0200 Subject: [PATCH] various: print the image path when setting up of the loopback device fails --- src/dissect/dissect.c | 2 +- src/portable/portable.c | 2 +- src/shared/dissect-image.c | 2 +- src/sysext/sysext.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index f1288b41a7..745366837f 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -774,7 +774,7 @@ static int run(int argc, char *argv[]) { FLAGS_SET(arg_flags, DISSECT_IMAGE_NO_PARTITION_TABLE) ? 0 : LO_FLAGS_PARTSCAN, &d); if (r < 0) - return log_error_errno(r, "Failed to set up loopback device: %m"); + return log_error_errno(r, "Failed to set up loopback device for %s: %m", arg_image); r = dissect_image_and_warn( d->fd, diff --git a/src/portable/portable.c b/src/portable/portable.c index 0799bff53d..53c4d8e25b 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -376,7 +376,7 @@ static int portable_extract_by_path( return r; } else if (r < 0) - return log_debug_errno(r, "Failed to set up loopback device: %m"); + return log_debug_errno(r, "Failed to set up loopback device for %s: %m", path); else { _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL; _cleanup_(rmdir_and_freep) char *tmpdir = NULL; diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index b425014457..05301ef16d 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -2741,7 +2741,7 @@ int mount_image_privately_interactively( FLAGS_SET(flags, DISSECT_IMAGE_NO_PARTITION_TABLE) ? 0 : LO_FLAGS_PARTSCAN, &d); if (r < 0) - return log_error_errno(r, "Failed to set up loopback device: %m"); + return log_error_errno(r, "Failed to set up loopback device for %s: %m", image); r = dissect_image_and_warn(d->fd, image, &verity, NULL, d->uevent_seqnum_not_before, d->timestamp_not_before, flags, &dissected_image); if (r < 0) diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index c5fdf99aa7..76a21afea6 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -525,7 +525,7 @@ static int merge_subprocess(Hashmap *images, const char *workspace) { r = loop_device_make_by_path(img->path, O_RDONLY, 0, &d); if (r < 0) - return log_error_errno(r, "Failed to set up loopback device: %m"); + return log_error_errno(r, "Failed to set up loopback device for %s: %m", img->path); r = dissect_image_and_warn( d->fd,