]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
gpt-auto-generator: warn on ambiguous blkid probe 935/head
authorTom Gundersen <teg@jklm.no>
Tue, 11 Aug 2015 16:22:59 +0000 (18:22 +0200)
committerTom Gundersen <teg@jklm.no>
Tue, 11 Aug 2015 21:38:19 +0000 (23:38 +0200)
src/gpt-auto-generator/gpt-auto-generator.c

index bfcdbc5fd0543cabb5723f6133a859bd122a394b..0a34f86be7cde2c44021b8b14575073f2fedcf2b 100644 (file)
@@ -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;