From: Richard W.M. Jones <rjones@redhat.com>
Date: Sun, 4 Dec 2011 16:47:37 +0000 (+0000)
Subject: Revert "blkid: Use -c /dev/null because RHEL 5 blkid doesn't have -p option."
X-Git-Tag: 1.15.10~5
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=e18058a5a56236cbac23f10dc8a91420a3525562;p=libguestfs.git

Revert "blkid: Use -c /dev/null because RHEL 5 blkid doesn't have -p option."

This reverts commit 6533491b178d18bfab8240cf093be4ef9b547548.
---

diff --git a/daemon/blkid.c b/daemon/blkid.c
index c610a41..a7fd6bc 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -94,11 +94,8 @@ do_blkid(const char *device)
   char **ret = NULL;
   int size = 0, alloc = 0;
 
-  r = command (&out, &err,
-               "blkid",
-               /* Adding -c option kills all caching, even on RHEL 5. */
-               "-c", "/dev/null",
-               "-p", "-i", "-o", "export", device, NULL);
+  const char *blkid[] = {"blkid", "-p", "-i", "-o", "export", device, NULL};
+  r = commandv(&out, &err, blkid);
   if (r == -1) {
     reply_with_error("%s", err);
     goto error;