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:
bd631df
)
daemon: blkid cache is at a different location on Debian.
author
Richard W.M. Jones
<rjones@redhat.com>
Tue, 23 Nov 2010 20:05:56 +0000
(20:05 +0000)
committer
Richard W.M. Jones
<rjones@redhat.com>
Wed, 24 Nov 2010 09:41:48 +0000
(09:41 +0000)
Remove both possible cache locations.
daemon/blkid.c
patch
|
blob
|
history
diff --git
a/daemon/blkid.c
b/daemon/blkid.c
index
108eee6
..
2885a8f
100644
(file)
--- a/
daemon/blkid.c
+++ b/
daemon/blkid.c
@@
-38,7
+38,8
@@
get_blkid_tag (const char *device, const char *tag)
* supposed to do this, but (a) it doesn't work and (b) that option
* is not supported in RHEL 5.
*/
- unlink ("/etc/blkid/blkid.tab");
+ unlink ("/etc/blkid/blkid.tab"); /* Red Hat, Fedora */
+ unlink ("/etc/blkid.tab"); /* Debian */
r = command (&out, &err,
"blkid", "-o", "value", "-s", tag, device, NULL);