X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fblkid.c;h=7935ac3fc5bb9c15201d28f136cd2336fa11a6f0;hb=e59e35708b4ad66c99f908c5226cb232931e1791;hp=dcfac65def4ffd7373699da54168c9217e31ddee;hpb=9e0b31a2af26b8d58a44dd80993a5e73d4942307;p=libguestfs.git

diff --git a/daemon/blkid.c b/daemon/blkid.c
index dcfac65..7935ac3 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -27,16 +27,22 @@
 #include "daemon.h"
 #include "actions.h"
 
-char *
-do_vfs_type (const char *device)
+static char *
+get_blkid_tag (const char *device, const char *tag)
 {
   char *out, *err;
   int r;
 
-  r = command (&out, &err,
-               "blkid", "-o", "value", "-s", "TYPE", device, NULL);
-  if (r == -1) {
-    reply_with_error ("%s: %s", device, err);
+  r = commandr (&out, &err,
+                "blkid",
+                /* Adding -c option kills all caching, even on RHEL 5. */
+                "-c", "/dev/null",
+                "-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;
@@ -44,6 +50,14 @@ do_vfs_type (const char *device)
 
   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')
@@ -51,3 +65,21 @@ do_vfs_type (const char *device)
 
   return out;                   /* caller frees */
 }
+
+char *
+do_vfs_type (const char *device)
+{
+  return get_blkid_tag (device, "TYPE");
+}
+
+char *
+do_vfs_label (const char *device)
+{
+  return get_blkid_tag (device, "LABEL");
+}
+
+char *
+do_vfs_uuid (const char *device)
+{
+  return get_blkid_tag (device, "UUID");
+}