multipath-tools: Update to latest development snapshot (120613).

[people/ms/ipfire-3.x.git] / multipath-tools / patches / 0006-RH-multipath.rules.patch

diff --git a/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch b/multipath-tools/patches/0006-RH-multipath.rules.patch
similarity index 58%
rename from multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch
rename to multipath-tools/patches/0006-RH-multipath.rules.patch
index 4250ec78bddbdd2b63c833907536e50d8df37175..bfcfc98b875d1f40a009d581e8849886db0a459e 100644 (file)
--- a/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch
+++ b/multipath-tools/patches/0006-RH-multipath.rules.patch
@@ -1,42 +1,48 @@
-From 5a43356b54c2672441ce67cd9602904a5df04117 Mon Sep 17 00:00:00 2001
-From: Fabio M. Di Nitto <fdinitto@redhat.com>
-Date: Mon, 19 Oct 2009 07:07:01 +0200
-Subject: [PATCH 10/12] RH: multipath rules + udev changes
-
-Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
 ---
-:100644 100644 ac97749... 064196d... M multipath/multipath.rules
  multipath/Makefile        |    6 +++---
- multipath/multipath.rules |   18 +++++++++++-------
- 2 files changed, 14 insertions(+), 10 deletions(-)
+ multipath/multipath.rules |   30 ++++++++++++++++++++++++------
+ 2 files changed, 27 insertions(+), 9 deletions(-)
 
-Index: multipath-tools/multipath/multipath.rules
+Index: multipath-tools-120613/multipath/multipath.rules
 ===================================================================
---- multipath-tools.orig/multipath/multipath.rules
-+++ multipath-tools/multipath/multipath.rules
-@@ -1,7 +1,11 @@
+--- multipath-tools-120613.orig/multipath/multipath.rules
++++ multipath-tools-120613/multipath/multipath.rules
+@@ -1,7 +1,25 @@
 -#
 -# udev rules for multipathing.
 -# The persistent symlinks are created with the kpartx rules
 -#
--
--# socket for uevents
--SUBSYSTEM=="block", 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"
+ 
+-# socket for uevents
+-SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event"
++ENV{MPATH_SBIN_PATH}="/sbin"
++TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin"
++
++ACTION=="add", ENV{DEVTYPE}!="partition", \
++      ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \
++      TEST=="/etc/multipath.conf", \
++      PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \
++      ENV{DM_MULTIPATH_DEVICE_PATH}="1"
++
++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_SUSPENDED}=="1", GOTO="end_mpath"
++ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10"
 +ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath"
++ENV{DM_SUSPENDED}=="1", GOTO="end_mpath"
 +ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath"
-+RUN+="$env{DM_SBIN_PATH}/kpartx -a -p p $tempnode"
++RUN+="$env{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode"
 +LABEL="end_mpath"
-Index: multipath-tools/multipath/Makefile
+Index: multipath-tools-120613/multipath/Makefile
 ===================================================================
---- multipath-tools.orig/multipath/Makefile
-+++ multipath-tools/multipath/Makefile
+--- multipath-tools-120613.orig/multipath/Makefile
++++ multipath-tools-120613/multipath/Makefile
 @@ -21,15 +21,15 @@ $(EXEC): $(OBJS)
  install:
        $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
@@ -44,7 +50,7 @@ Index: multipath-tools/multipath/Makefile
 -      $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
 -      $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
 +      $(INSTALL_PROGRAM) -d $(DESTDIR)/lib/udev/rules.d
-+      $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/lib/udev/rules.d/40-multipath.rules
++      $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/lib/udev/rules.d/62-multipath.rules
        $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
        $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
        $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
@@ -52,7 +58,7 @@ Index: multipath-tools/multipath/Makefile
  
  uninstall:
 -      rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
-+      rm $(DESTDIR)/lib/udev/rules.d/multipath.rules
++      rm $(DESTDIR)/lib/udev/rules.d/62-multipath.rules
        rm $(DESTDIR)$(bindir)/$(EXEC)
        rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
        rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz