X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fblkid.c;h=f631061109e77774c5ef37e5aeb02c027733f744;hb=fbfc1768a878044720cd5f03dc6e308dbdc70595;hp=2885a8f30c3f0c607ed7b3536b6ec01d5c487123;hpb=7141850a2ca8094f91c709cbdcb8dd0e094a6d18;p=libguestfs.git

diff --git a/daemon/blkid.c b/daemon/blkid.c
index 2885a8f..f631061 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -41,10 +41,13 @@ get_blkid_tag (const char *device, const char *tag)
   unlink ("/etc/blkid/blkid.tab"); /* Red Hat, Fedora */
   unlink ("/etc/blkid.tab"); /* Debian */
 
-  r = command (&out, &err,
-               "blkid", "-o", "value", "-s", tag, device, NULL);
-  if (r == -1) {
-    reply_with_error ("%s: %s", device, err);
+  r = commandr (&out, &err,
+                "blkid", "-o", "value", "-s", tag, device, NULL);
+  if (r != 0 && r != 2) {
+    if (r >= 0)
+      reply_with_error ("%s: %s (blkid returned %d)", device, err, r);
+    else
+      reply_with_error ("%s: %s", device, err);
     free (out);
     free (err);
     return NULL;
@@ -52,6 +55,14 @@ get_blkid_tag (const char *device, const char *tag)
 
   free (err);
 
+  if (r == 2) {                 /* means UUID etc not found */
+    free (out);
+    out = strdup ("");
+    if (out == NULL)
+      reply_with_perror ("strdup");
+    return out;
+  }
+
   /* Trim trailing \n if present. */
   size_t len = strlen (out);
   if (len > 0 && out[len-1] == '\n')