From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 12 Sep 2006 05:30:53 +0000 (-0400)
Subject: Fix bug in device mapper scanning; probe_one() doesn't want a leading /dev
X-Git-Tag: E2FSPROGS-1_40-WIP-1114~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a02fa9beb8ea198766a81c0bf01aa04dc8787237;p=thirdparty%2Fe2fsprogs.git

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 cf46f0969..7835a26f4 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 4c2c895b2..f8f5f48c9 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;