diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-12-04 16:47:37 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-12-04 16:47:37 +0000 |
| commit | e18058a5a56236cbac23f10dc8a91420a3525562 (patch) | |
| tree | 42fa028aa2b2765c0cebf2fab30d3f0654689a11 | |
| parent | 7f14c042eb6ecab162d599fb182c7d63cebcfb9e (diff) | |
| download | libguestfs-e18058a5a56236cbac23f10dc8a91420a3525562.tar.gz libguestfs-e18058a5a56236cbac23f10dc8a91420a3525562.tar.xz libguestfs-e18058a5a56236cbac23f10dc8a91420a3525562.zip | |
Revert "blkid: Use -c /dev/null because RHEL 5 blkid doesn't have -p option."
This reverts commit 6533491b178d18bfab8240cf093be4ef9b547548.
| -rw-r--r-- | daemon/blkid.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/daemon/blkid.c b/daemon/blkid.c index c610a418..a7fd6bc1 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; |