summaryrefslogtreecommitdiffstats
path: root/multipath_rules.patch
diff options
context:
space:
mode:
authorBenjamin Marzinski <bmarzins@fedoraproject.org>2008-09-26 23:28:36 +0000
committerBenjamin Marzinski <bmarzins@fedoraproject.org>2008-09-26 23:28:36 +0000
commit765b6859467587798b2f96ad85665c13fd8f03ed (patch)
tree43cbab29c1df819799b71a358f2d926b41946506 /multipath_rules.patch
parent4fa3700b25f28485679b1caf4a9ff46adbfb8602 (diff)
Since libaio is now in /lib, not /usr/lib, multipath no longer needs todevice-mapper-multipath-0_4_8-7_fc10F-10-startF-10-split
statically link against it. Fixed an error with binding file and WWIDs that include spaces. Cleaned up the messages from the directio checker function. Fixed the udev rules. Fixed a regression in multipath.conf parsing Fixed 457530, 457589
Diffstat (limited to 'multipath_rules.patch')
-rw-r--r--multipath_rules.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/multipath_rules.patch b/multipath_rules.patch
index ea545a2..56e0bb9 100644
--- a/multipath_rules.patch
+++ b/multipath_rules.patch
@@ -1,7 +1,7 @@
-Index: multipath-tools-080515/multipath/Makefile
+Index: multipath-tools/multipath/Makefile
===================================================================
---- multipath-tools-080515.orig/multipath/Makefile
-+++ multipath-tools-080515/multipath/Makefile
+--- multipath-tools.orig/multipath/Makefile
++++ multipath-tools/multipath/Makefile
@@ -23,7 +23,7 @@ install:
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) -m 755 $(EXEC) mpath_wait $(DESTDIR)$(bindir)/
@@ -20,24 +20,22 @@ Index: multipath-tools-080515/multipath/Makefile
rm $(DESTDIR)$(bindir)/$(EXEC)
rm $(DESTDIR)$(bindir)/mpath_wait
rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-Index: multipath-tools-080515/multipath/multipath.rules
+Index: multipath-tools/multipath/multipath.rules
===================================================================
---- multipath-tools-080515.orig/multipath/multipath.rules
-+++ multipath-tools-080515/multipath/multipath.rules
-@@ -1,7 +1,9 @@
+--- multipath-tools.orig/multipath/multipath.rules
++++ multipath-tools/multipath/multipath.rules
+@@ -1,7 +1,8 @@
-#
-# udev rules for multipathing.
-# The persistent symlinks are created with the kpartx rules
-#
-
-# socket for uevents
--RUN+="socket:/org/kernel/dm/multipath_event"
+# multipath wants the devmaps presented as meaninglful device names
+# so name them after their devmap name
+SUBSYSTEM!="block", GOTO="end_mpath"
-+KERNEL!="dm-[0-9]*", ACTION=="add", PROGRAM=="/bin/bash -c '/sbin/lsmod | /bin/grep ^dm_multipath'", RUN+="/sbin/multipath -v0 %M:%m"
+ RUN+="socket:/org/kernel/dm/multipath_event"
+KERNEL!="dm-[0-9]*", GOTO="end_mpath"
+PROGRAM!="/sbin/mpath_wait %M %m", GOTO="end_mpath"
+ACTION=="add", RUN+="/sbin/dmsetup ls --target multipath --exec '/sbin/kpartx -a -p p' -j %M -m %m"
-+PROGRAM!="/bin/bash -c '/sbin/dmsetup info -c --noheadings -j %M -m %m | /bin/grep -q .*:.*:.*:.*:.*:.*:.*:part[0-9]*-mpath-'", GOTO="end_mpath"
+LABEL="end_mpath"