From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 11 Jan 2014 21:45:29 +0000 (-0500)
Subject: gpt-auto-generator: use EBADSLT code when unable to detect partition type
X-Git-Tag: v209~463
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b94801803417c23d099cb7e508754181ecd27f9c

gpt-auto-generator: use EBADSLT code when unable to detect partition type

ENODEV suggests that something is missing, which is be misleading
here.
---

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index e21ede94d..05934da82 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -74,10 +74,8 @@ static int verify_gpt_partition(const char *node, sd_id128_t *type, unsigned *nr
 
         errno = 0;
         r = blkid_do_safeprobe(b);
-        if (r == -2)
-                return -ENODEV;
-        else if (r == 1)
-                return -ENODEV;
+        if (r == -2 || r == 1) /* no result or uncertain */
+                return -EBADSLT;
         else if (r != 0)
                 return errno ? -errno : -EIO;
 
@@ -298,7 +296,7 @@ static int enumerate_partitions(struct udev *udev, dev_t dev) {
                 r = verify_gpt_partition(node, &type_id, &nr, &fstype);
                 if (r < 0) {
                         /* skip child devices which are not detected properly */
-                        if (r == -ENODEV)
+                        if (r == -EBADSLT)
                                 continue;
                         log_error("Failed to verify GPT partition %s: %s",
                                   node, strerror(-r));