From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Oct 2024 12:16:53 +0000 (+0200)
Subject: dissect-image: generate better log message for EUCLEAN dissect error
X-Git-Tag: v256.8~88
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=452cfd91fe07792775f4eccad813e148f96d4a86;p=systemd%2F.git

dissect-image: generate better log message for EUCLEAN dissect error

Fixes: #31799
(cherry picked from commit 2186334e00acba6e6c1a4564bce60474eecfbf16)
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 9a3a4f3dc0..65a706dc8a 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -706,7 +706,9 @@ static int dissect_image(
          * Returns -ERFKILL if image doesn't match image policy
          * Returns -EBADR if verity data was provided externally for an image that has a GPT partition table (i.e. is not just a naked fs)
          * Returns -EPROTONOSUPPORT if DISSECT_IMAGE_ADD_PARTITION_DEVICES is set but the block device does not have partition logic enabled
-         * Returns -ENOMSG if we didn't find a single usable partition (and DISSECT_IMAGE_REFUSE_EMPTY is set) */
+         * Returns -ENOMSG if we didn't find a single usable partition (and DISSECT_IMAGE_REFUSE_EMPTY is set)
+         * Returns -EUCLEAN if some file system had an ambiguous file system superblock signature
+         */
 
         uint64_t diskseq = m->loop ? m->loop->diskseq : 0;
 
@@ -1662,6 +1664,9 @@ int dissect_log_error(int log_level, int r, const char *name, const VeritySettin
         case -ENOMSG:
                 return log_full_errno(log_level, r, "%s: No suitable partitions found.", name);
 
+        case -EUCLEAN:
+                return log_full_errno(log_level, r, "%s: Partition with ambiguous file system superblock signature found.", name);
+
         default:
                 return log_full_errno(log_level, r, "%s: Cannot dissect image: %m", name);
         }