summaryrefslogtreecommitdiff
path: root/lib/blkid
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2006-09-12 01:30:53 -0400
committerTheodore Ts'o <tytso@mit.edu>2006-09-12 01:30:53 -0400
commita02fa9beb8ea198766a81c0bf01aa04dc8787237 (patch)
tree2fe8fa5655a280b44c02d2e8934ab57c9e0180b3 /lib/blkid
parent3d3689fe1446df38aff761213d565aefaae8f44a (diff)
downloade2fsprogs-a02fa9beb8ea198766a81c0bf01aa04dc8787237.tar.gz
Fix bug in device mapper scanning; probe_one() doesn't want a leading /dev
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'lib/blkid')
-rw-r--r--lib/blkid/ChangeLog5
-rw-r--r--lib/blkid/devname.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index cf46f096..7835a26f 100644
--- 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 4c2c895b..f8f5f48c 100644
--- 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;