From: Tom Gundersen <teg@jklm.no>
Date: Tue, 11 Aug 2015 16:22:59 +0000 (+0200)
Subject: gpt-auto-generator: warn on ambiguous blkid probe
X-Git-Tag: v225~80^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=458a2f85e8ae08c534bf8d030fbeeb791893422b;p=thirdparty%2Fsystemd.git

gpt-auto-generator: warn on ambiguous blkid probe
---

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index bfcdbc5fd05..0a34f86be7c 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -618,9 +618,12 @@ static int enumerate_partitions(dev_t devnum) {
 
         errno = 0;
         r = blkid_do_safeprobe(b);
-        if (r == -2 || r == 1) /* no result or uncertain */
+        if (r == 1)
+                return 0; /* no results */
+        else if (r == -2) {
+                log_warning("%s: probe gave ambiguous results, ignoring", node);
                 return 0;
-        else if (r != 0)
+        } else if (r != 0)
                 return log_error_errno(errno ?: EIO, "%s: failed to probe: %m", node);
 
         errno = 0;