[lvm2/f16] Fix dmsetup table output if major:minor pair is specified. (bug 740341)

[Milan Broz]

commit bf6f34a2f95c130c0f03c477fb99da27f00f5a2f
Author: Milan Broz <mbroz at fedoraproject.org>
Date:   Thu Jan 26 21:51:25 2012 +0100

    Fix dmsetup table output if major:minor pair is specified.
    (bug 740341)

 lvm2-fix-dmsetup-table.patch |   21 +++++++++++++++++++++
 lvm2.spec                    |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/lvm2-fix-dmsetup-table.patch b/lvm2-fix-dmsetup-table.patch
new file mode 100644
index 0000000..647eca6
--- /dev/null
+++ b/lvm2-fix-dmsetup-table.patch
@@ -0,0 +1,21 @@
+--- LVM2.2.02.86.old/tools/dmsetup.c	2011-07-08 19:08:19.000000000 +0200
++++ LVM2.2.02.86/tools/dmsetup.c	2012-01-26 21:15:18.807295520 +0100
+@@ -3476,7 +3476,8 @@ int main(int argc, char **argv)
+ 	#endif
+ 
+       doit:
+-	multiple_devices = (argc != 2 && cmd->repeatable_cmd);
++	multiple_devices = (cmd->repeatable_cmd && argc != 2 &&
++			    (argc != 1 || (!_switches[UUID_ARG] && !_switches[MAJOR_ARG])));
+ 	do {
+ 		if (!cmd->fn(cmd, argc--, argv++, NULL, multiple_devices)) {
+ 			fprintf(stderr, "Command failed\n");
+--- LVM2.2.02.86.old/WHATS_NEW_DM	2012-01-26 21:10:23.000000000 +0100
++++ LVM2.2.02.86/WHATS_NEW_DM	2012-01-26 21:15:59.497295313 +0100
+@@ -1,5 +1,6 @@
+ Version 1.02.66 -
+ ===============================
++  Remove dev name prefix from dmsetup line output if major and minor is used.
+   Add support for systemd file descriptor handover to dmeventd.
+   Add support for new oom killer adjustment interface (oom_score_adj).
+   Add systemd unit files for dmeventd.
diff --git a/lvm2.spec b/lvm2.spec
index 58848d4..90e7669 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -39,7 +39,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.86
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -54,6 +54,7 @@ Patch3: lvm2-autoreconf.patch
 Patch4: lvm2-new-oom-adj-interface.patch
 Patch5: lvm2-systemd-fds-handover.patch
 Patch6: lvm2-fix-default_udev_sync.patch
+Patch7: lvm2-fix-dmsetup-table.patch
 
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: ncurses-devel
@@ -99,6 +100,7 @@ or more physical volumes and creating one or more logical volumes
 %patch4 -p1 -b .oom_adj
 %patch5 -p1 -b .systemd_fds
 %patch6 -p1 -b .default_udev_sync
+%patch7 -p1 -b .table
 
 %build
 %define _exec_prefix ""
@@ -595,6 +597,9 @@ the device-mapper event library.
 /usr%{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Thu Jan 26 2012 Milan Broz <mbroz at redhat.com> - 2.02.86-6
+- Fix dmsetup table output if major:minor pair is specified.
+
 * Wed Aug 03 2011 Peter Rajnoha <prajnoha at redhat.com> - 2.02.86-5
 - Change DEFAULT_UDEV_SYNC to 1 so udev_sync is used even without any config.