From 3b35f5eb729f2feaafcdfbaaced82b79aebc1fc4 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Mon, 30 Apr 2012 18:27:57 -0500
Subject: [PATCH] device-mapper-multipath-0.4.9-25 Modify
 0024-RH-libudev-monitor.patch Resolves: bz #805493

---
 0024-RH-libudev-monitor.patch | 19 ++++++++++++++++---
 device-mapper-multipath.spec  |  6 +++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/0024-RH-libudev-monitor.patch b/0024-RH-libudev-monitor.patch
index b092779..6792aa3 100644
--- a/0024-RH-libudev-monitor.patch
+++ b/0024-RH-libudev-monitor.patch
@@ -1,7 +1,8 @@
 ---
- libmultipath/Makefile |    2 
- libmultipath/uevent.c |  151 ++++++++++++++++++++++++++++++++++++++++++++------
- 2 files changed, 134 insertions(+), 19 deletions(-)
+ libmultipath/Makefile     |    2 
+ libmultipath/uevent.c     |  151 ++++++++++++++++++++++++++++++++++++++++------
+ multipath/multipath.rules |    1 
+ 3 files changed, 134 insertions(+), 20 deletions(-)
 
 Index: multipath-tools-120123/libmultipath/Makefile
 ===================================================================
@@ -203,3 +204,15 @@ Index: multipath-tools-120123/libmultipath/uevent.c
  }
  
  extern int
+Index: multipath-tools-120123/multipath/multipath.rules
+===================================================================
+--- multipath-tools-120123.orig/multipath/multipath.rules
++++ multipath-tools-120123/multipath/multipath.rules
+@@ -13,7 +13,6 @@ ACTION=="add", ENV{DEVTYPE}!="partition"
+ ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{DEVTYPE}!="partition", \
+ 	RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
+ 
+-RUN+="socket:/org/kernel/dm/multipath_event"
+ KERNEL!="dm-*", GOTO="end_mpath"
+ ACTION!="change", GOTO="end_mpath"
+ ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10"
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 4414b2c..5c14e21 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: 24%{?dist}
+Release: 25%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -198,6 +198,10 @@ bin/systemctl --no-reload enable multipathd.service >/dev/null 2>&1 ||:
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Mon Apr 30 2012 Benjamin Marzinski <bmarzins@redhat.com> 0.4.9-25
+- Modify 0024-RH-libudev-monitor.patch
+- Resolves: bz #805493
+
 * Mon Apr 30 2012 Benjamin Marzinski <bmarzins@redhat.com> 0.4.9-24
 - Add requirements on libudev to spec file
 - Resolves: bz #805493