git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
615924a
)
blkid: Use -c /dev/null because RHEL 5 blkid doesn't have -p option.
author
Richard W.M. Jones
<rjones@redhat.com>
Sat, 3 Dec 2011 22:58:03 +0000
(22:58 +0000)
committer
Richard W.M. Jones
<rjones@redhat.com>
Sat, 3 Dec 2011 22:58:03 +0000
(22:58 +0000)
daemon/blkid.c
patch
|
blob
|
history
diff --git
a/daemon/blkid.c
b/daemon/blkid.c
index
a7fd6bc
..
c610a41
100644
(file)
--- 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;