[device-mapper-multipath] device-mapper-multipath-0.4.9-50

[Benjamin Marzinski]

commit f5329c27a7e63f153340ffa3f26cfa7b4fd7ca3d
Author: Benjamin Marzinski <bmarzins at redhat.com>
Date:   Tue Apr 30 12:54:11 2013 -0500

    device-mapper-multipath-0.4.9-50
    
    Add 0031-RHBZ-957188-kpartx-use-dm-name.patch
      * use the basename of the devices that will be created to choose the
        delimiter instead of using the device name from the command line
    Resolves: bz #957188

 0031-RHBZ-957188-kpartx-use-dm-name.patch |   17 +++++++++++++++++
 device-mapper-multipath.spec              |   10 +++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/0031-RHBZ-957188-kpartx-use-dm-name.patch b/0031-RHBZ-957188-kpartx-use-dm-name.patch
new file mode 100644
index 0000000..282c517
--- /dev/null
+++ b/0031-RHBZ-957188-kpartx-use-dm-name.patch
@@ -0,0 +1,17 @@
+---
+ kpartx/kpartx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: multipath-tools-130222/kpartx/kpartx.c
+===================================================================
+--- multipath-tools-130222.orig/kpartx/kpartx.c
++++ multipath-tools-130222/kpartx/kpartx.c
+@@ -348,7 +348,7 @@ main(int argc, char **argv){
+ 	if (delim == NULL) {
+ 		delim = malloc(DELIM_SIZE);
+ 		memset(delim, 0, DELIM_SIZE);
+-		set_delimiter(device, delim);
++		set_delimiter(mapname, delim);
+ 	}
+ 
+ 	fd = open(device, O_RDONLY);
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 821f27c..315bb91 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.9
-Release: 49%{?dist}
+Release: 50%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -38,6 +38,7 @@ Patch0027: 0027-RH-get-wwid.patch
 Patch0028: 0028-RHBZ-929078-refresh-udev-dev.patch
 Patch0029: 0029-RH-no-prio-put-msg.patch
 Patch0030: 0030-RHBZ-916528-override-queue-no-daemon.patch
+Patch0031: 0031-RHBZ-957188-kpartx-use-dm-name.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -120,6 +121,7 @@ kpartx manages partition creation and removal for device-mapper devices.
 %patch0028 -p1
 %patch0029 -p1
 %patch0030 -p1
+%patch0031 -p1
 cp %{SOURCE1} .
 
 %build
@@ -213,6 +215,12 @@ bin/systemctl --no-reload enable multipathd.service >/dev/null 2>&1 ||:
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Tue Apr 30 2013 Benjamin Marzinski <bmarzins at redhat.com> 0.4.9-50
+- Add 0031-RHBZ-957188-kpartx-use-dm-name.patch
+  * use the basename of the devices that will be created to choose the
+    delimiter instead of using the device name from the command line
+- Resolves: bz #957188
+
 * Fri Apr 26 2013 Benjamin Marzinski <bmarzins at redhat.com> 0.4.9-49
 - Modify 0020-RHBZ-907360-static-pthread-init.patch
   * Don't initialize uevent list twice