diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-12-03 22:58:03 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-12-03 22:58:03 +0000 |
| commit | 6533491b178d18bfab8240cf093be4ef9b547548 (patch) | |
| tree | df638fb99fdd64857838d2960cee9835c9cbdce2 | |
| parent | 615924abaa968398d6529529fa2f31ae23de825b (diff) | |
| download | libguestfs-6533491b178d18bfab8240cf093be4ef9b547548.tar.gz libguestfs-6533491b178d18bfab8240cf093be4ef9b547548.tar.xz libguestfs-6533491b178d18bfab8240cf093be4ef9b547548.zip | |
blkid: Use -c /dev/null because RHEL 5 blkid doesn't have -p option.
| -rw-r--r-- | daemon/blkid.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/daemon/blkid.c b/daemon/blkid.c index a7fd6bc1..c610a418 100644 --- a/daemon/blkid.c +++ b/daemon/blkid.c @@ -94,8 +94,11 @@ do_blkid(const char *device) char **ret = NULL; int size = 0, alloc = 0; - const char *blkid[] = {"blkid", "-p", "-i", "-o", "export", device, NULL}; - r = commandv(&out, &err, blkid); + r = command (&out, &err, + "blkid", + /* Adding -c option kills all caching, even on RHEL 5. */ + "-c", "/dev/null", + "-p", "-i", "-o", "export", device, NULL); if (r == -1) { reply_with_error("%s", err); goto error; |