* Wed Jun 24 2009 Eric Sandeen <sandeen@redhat.com> 1.41.4-6e2fsprogs-1_41_4-6_fc10

- blkid: use /dev/mapper/<name> vs /dev/dm-<N> (#497259)

3 files changed, 77 insertions, 2 deletions

diff --git a/e2fsprogs-1.41.4-dev-mapper-names.patch b/e2fsprogs-1.41.4-dev-mapper-names.patch
new file mode 100644
index 0000000..b35cade
--- /dev/null
+++ b/e2fsprogs-1.41.4-dev-mapper-names.patch
@@ -0,0 +1,68 @@
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 27 Apr 2009 13:00:57 +0000 (+0200)
+Subject: blkid: use /dev/mapper/<name> rather than /dev/dm-<N>
+X-Git-Tag: v1.41.6~32
+X-Git-Url: http://git.kernel.org/?p=fs%2Fext2%2Fe2fsprogs.git;a=commitdiff_plain;h=4271e23942bdc60e1fa6c0b26bc666a94a8b3e1d
+
+blkid: use /dev/mapper/<name> rather than /dev/dm-<N>
+
+The libblkid (since v1.41.1) returns private device-mapper names (e.g.
+/dev/dm-0). It's because the probe_one() function scans /dev before
+/dev/mapper.
+
+brw-rw---- 1 root disk 253, 0 2009-04-27 13:41 /dev/dm-0
+brw-rw---- 1 root disk 253, 0 2009-04-27 13:41 /dev/mapper/TestVolGroup-TestLogVolume
+
+Old version:
+  # blkid -t LABEL="TEST-LABEL" -o device
+  /dev/dm-0
+
+Fixed version:
+  # blkid -t LABEL="TEST-LABEL" -o device
+  /dev/mapper/TestVolGroup-TestLogVolume
+
+Addresses-Red-Hat-Bug: #497259
+Signed-off-by: Karel Zak <kzak@redhat.com>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+
+Index: e2fsprogs-1.41.4/lib/blkid/devname.c
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/blkid/devname.c
++++ e2fsprogs-1.41.4/lib/blkid/devname.c
+@@ -179,6 +179,15 @@ static void probe_one(blkid_cache cache,
+ 	if (dev && dev->bid_devno == devno)
+ 		goto set_pri;
+ 
++	/* Try to translate private device-mapper dm-<N> names
++	 * to standard /dev/mapper/<name>.
++	 */
++	if (!strncmp(ptname, "dm-", 3) && isdigit(ptname[3])) {
++		blkid__scan_dir("/dev/mapper", devno, 0, &devname);
++		if (devname)
++			goto get_dev;
++	}
++
+ 	/*
+ 	 * Take a quick look at /dev/ptname for the device number.  We check
+ 	 * all of the likely device directories.  If we don't find it, or if
+@@ -197,7 +206,7 @@ static void probe_one(blkid_cache cache,
+ 		if (stat(device, &st) == 0 && S_ISBLK(st.st_mode) &&
+ 		    st.st_rdev == devno) {
+ 			devname = blkid_strdup(device);
+-			break;
++			goto get_dev;
+ 		}
+ 	}
+ 	/* Do a short-cut scan of /dev/mapper first */
+@@ -208,9 +217,9 @@ static void probe_one(blkid_cache cache,
+ 		if (!devname)
+ 			return;
+ 	}
++get_dev:
+ 	dev = blkid_get_dev(cache, devname, BLKID_DEV_NORMAL);
+ 	free(devname);
+-
+ set_pri:
+ 	if (dev) {
+ 		if (pri)
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index b0e0b51..10c636a 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -20,6 +20,7 @@ Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
 Patch5: e2fsprogs-1.41.4-fix-blkid-segfault.patch
 Patch6: e2fsprogs-1.41.4-ignore-NEEDS_RECOVERY-mismatch.patch
 Patch10: e2fsprogs-journal-move.patch
+Patch11: e2fsprogs-1.41.4-dev-mapper-names.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -108,6 +109,9 @@ SMP systems.
 # Only change the journal placement for ext4, for now.
 %patch10 -p1 -b .journalmove
 
+# Fix devicemapper names
+%patch11 -p1 -b .devmapper_names
+ 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
 make %{?_smp_mflags}
@@ -305,6 +309,9 @@ fi
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Wed Jun 24 2009 Eric Sandeen <sandeen@redhat.com> 1.41.4-6
+- blkid: use /dev/mapper/<name> vs /dev/dm-<N> (#497259)
+
 * Sat Apr 11 2009 Eric Sandeen <sandeen@redhat.com> 1.41.4-5
 - ignore differing NEEDS_RECOVERY flag on fsck post-resize (#471925)
 
diff --git a/uuidd.init b/uuidd.init
index e269da8..9aca1da 100755
--- a/uuidd.init
+++ b/uuidd.init
@@ -65,7 +65,7 @@ case "$1" in
 	;;
   status)
 	status -p /var/lib/libuuid/uuidd.pid uuidd uuidd
-	REVAL=$?
+	RETVAL=$?
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"