From: Richard Jones <rjones@redhat.com>
Date: Tue, 1 Jun 2010 14:27:57 +0000 (+0100)
Subject: daemon: Kill blkid cache to improve reliability of blkid commands.
X-Git-Tag: 1.2.9~9
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=858661ca961a751b0ba3bc64cdcbe7aca8c877a4;p=libguestfs.git

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.
(cherry picked from commit 21c42e9fabf6cea3d564e338a314479ef120502a)
---

diff --git a/daemon/blkid.c b/daemon/blkid.c
index 1ddc8cd..a619730 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) {