From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 23 Nov 2010 20:05:56 +0000 (+0000)
Subject: daemon: blkid cache is at a different location on Debian.
X-Git-Tag: 1.7.13~13
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=5d7ee3f0c5b65cc7c417d762a648ce6c5bfdb532;p=libguestfs.git

daemon: blkid cache is at a different location on Debian.

Remove both possible cache locations.
---

diff --git a/daemon/blkid.c b/daemon/blkid.c
index 108eee6..2885a8f 100644
--- 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);