Fix bug in device mapper scanning; probe_one() doesn't want a leading /dev

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index cf46f0969eebff7d04fd6bd49596957da4bd27cc..7835a26f4dbe06efc96b6da8345cd22fe6597beb 100644 (file)
--- a/lib/blkid/ChangeLog
+++ b/lib/blkid/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-12  Theodore Tso  <tytso@mit.edu>
+
+       * devname.c (dm_probe_all): probe_one expects device names passed
+               to it w/o the leading "/dev".
+
 2006-08-19  Andreas Dilger <adilger@clusterfs.com>
 
        * blkid.8.in: Make the description of the -l option more accurate.

diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
index 4c2c895b235290ebf4347fef02d76d59e606d3ae..f8f5f48c90459fd87c416f1b94b01cc365e3ac2c 100644 (file)
--- a/lib/blkid/devname.c
+++ b/lib/blkid/devname.c
@@ -291,7 +291,7 @@ static void dm_probe_all(blkid_cache cache, int only_if_new)
 
                names = (void *)names + next;
 
-               rc = asprintf(&device, "/dev/mapper/%s", names->name);
+               rc = asprintf(&device, "mapper/%s", names->name);
                if (rc < 0)
                        goto try_next;