daemon: Generalize the implementation of vfs-type.

Note that there is no change to the semantics of the code.
(cherry picked from commit 85c71f8fff3e80f549342bf995b686ba7303c2b4)

diff --git a/daemon/blkid.c b/daemon/blkid.c
index dcfac65..1ddc8cd 100644 (file)
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -27,14 +27,14 @@
 #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);
+               "blkid", "-o", "value", "-s", tag, device, NULL);
   if (r == -1) {
     reply_with_error ("%s: %s", device, err);
     free (out);
@@ -51,3 +51,9 @@ do_vfs_type (const char *device)
 
   return out;                   /* caller frees */
 }
+
+char *
+do_vfs_type (const char *device)
+{
+  return get_blkid_tag (device, "TYPE");
+}