summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2010-06-01 15:27:57 +0100
committerRichard Jones <rjones@redhat.com>2010-06-01 15:29:09 +0100
commit21c42e9fabf6cea3d564e338a314479ef120502a (patch)
tree97e48add7879ae56e9f59850dad43a168f5dff34
parent85c71f8fff3e80f549342bf995b686ba7303c2b4 (diff)
downloadlibguestfs-21c42e9fabf6cea3d564e338a314479ef120502a.tar.gz
libguestfs-21c42e9fabf6cea3d564e338a314479ef120502a.tar.xz
libguestfs-21c42e9fabf6cea3d564e338a314479ef120502a.zip
daemon: Kill blkid cache to improve reliability of blkid commands.
By killing the cache file, we make blkid work in situations such as a just-created filesystem.
-rw-r--r--daemon/blkid.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/daemon/blkid.c b/daemon/blkid.c
index 1ddc8cdf..a6197308 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -33,6 +33,13 @@ get_blkid_tag (const char *device, const char *tag)
char *out, *err;
int r;
+ /* Kill the cache file, forcing blkid to reread values from the
+ * original filesystems. In blkid there is a '-p' option which is
+ * 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");
+
r = command (&out, &err,
"blkid", "-o", "value", "-s", tag, device, NULL);
if (r == -1) {