From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Feb 2017 15:18:03 +0000 (+0100)
Subject: dissect: generate friendly error messages for more error conditions
X-Git-Tag: v233~52^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94c4c6227957ef34b7f46daaab75bb5911062462;p=thirdparty%2Fsystemd.git

dissect: generate friendly error messages for more error conditions

Fixes: #5408
---

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 59bd7d9e846..06564e94b16 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -208,6 +208,14 @@ int main(int argc, char *argv[]) {
                 log_error_errno(r, "No root partition for specified root hash found in %s.", arg_image);
                 goto finish;
         }
+        if (r == -ENOTUNIQ) {
+                log_error_errno(r, "Multiple suitable root partitions found in image %s.", arg_image);
+                goto finish;
+        }
+        if (r == -ENXIO) {
+                log_error_errno(r, "No suitable root partition found in image %s.", arg_image);
+                goto finish;
+        }
         if (r < 0) {
                 log_error_errno(r, "Failed to dissect image: %m");
                 goto finish;