daemon: blkid cache is at a different location on Debian.
authorRichard W.M. Jones <rjones@redhat.com>
Tue, 23 Nov 2010 20:05:56 +0000 (20:05 +0000)
committerRichard 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

index 108eee6..2885a8f 100644 (file)
@@ -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);