[device-mapper-multipath/f21] device-mapper-multipath-0.4.9-68.fc21.3

[Benjamin Marzinski]

commit 15f74fddc0fd083bd279fb4392f9ddf9b5462653
Author: Benjamin Marzinski <bmarzins at redhat.com>
Date:   Wed Feb 18 21:33:16 2015 -0600

    device-mapper-multipath-0.4.9-68.fc21.3
    
    Add 0086-RHBZ-1153080-blacklist-vd-devs.patch
      * blacklist vd[a-z] devices, since they don't have a WWID for
        multipath to use.
    Resolves: bz #1153080

 0086-RHBZ-1153080-blacklist-vd-devs.patch |   17 +++++++++++++++++
 device-mapper-multipath.spec              |   10 +++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/0086-RHBZ-1153080-blacklist-vd-devs.patch b/0086-RHBZ-1153080-blacklist-vd-devs.patch
new file mode 100644
index 0000000..e4269ce
--- /dev/null
+++ b/0086-RHBZ-1153080-blacklist-vd-devs.patch
@@ -0,0 +1,17 @@
+---
+ libmultipath/blacklist.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: multipath-0.4.9-68.fc21.2/libmultipath/blacklist.c
+===================================================================
+--- multipath-0.4.9-68.fc21.2.orig/libmultipath/blacklist.c
++++ multipath-0.4.9-68.fc21.2/libmultipath/blacklist.c
+@@ -163,7 +163,7 @@ setup_default_blist (struct config * con
+ 	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
+ 		return 1;
+ 
+-	str = STRDUP("^(td|hd)[a-z]");
++	str = STRDUP("^(td|hd|vd)[a-z]");
+ 	if (!str)
+ 		return 1;
+ 	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 80435bb..973cb65 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: 68%{?dist}.2
+Release: 68%{?dist}.3
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -93,6 +93,7 @@ Patch0082: 0082-UPBZ-1104605-reload-on-rename.patch
 Patch0083: 0083-UPBZ-1160429-user-friendly-name-remap.patch
 Patch0084: 0084-RHBZ-1160429-cleanup-remap.patch
 Patch0085: 0085-RHBZ-1160478-mpathconf-template.patch
+Patch0086: 0086-RHBZ-1153080-blacklist-vd-devs.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -229,6 +230,7 @@ kpartx manages partition creation and removal for device-mapper devices.
 %patch0083 -p1
 %patch0084 -p1
 %patch0085 -p1
+%patch0086 -p1
 cp %{SOURCE1} .
 
 %build
@@ -327,6 +329,12 @@ bin/systemctl --no-reload enable multipathd.service >/dev/null 2>&1 ||:
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Wed Feb 18 2015 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.9-68.fc21.3
+- Add 0086-RHBZ-1153080-blacklist-vd-devs.patch
+  * blacklist vd[a-z] devices, since they don't have a WWID for
+    multipath to use.
+- Resolves: bz #1153080
+
 * Tue Dec  9 2014 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.9-68.fc21.2
 - Add 0085-RHBZ-1160478-mpathconf-template.patch
   * mpathconf no longer copies the default config template for the