- Drop RUN+="socket:..." and update the multipath.rule like Fedora

does.

OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=33
This commit is contained in:
Robert Milasan 2012-06-11 13:04:35 +00:00 committed by Git OBS Bridge
parent dc4b6848bc
commit 7585548e0a
3 changed files with 43 additions and 0 deletions

View File

@ -0,0 +1,35 @@
Index: multipath-tools-0.4.9/multipath/multipath.rules
===================================================================
--- multipath-tools-0.4.9.orig/multipath/multipath.rules
+++ multipath-tools-0.4.9/multipath/multipath.rules
@@ -1,7 +1,25 @@
#
-# udev rules for multipathing.
-# The persistent symlinks are created with the kpartx rules
-#
+# multipath wants the devmaps presented as meaninglful device names
+# so name them after their devmap name
+SUBSYSTEM!="block", GOTO="end_mpath"
+
+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", \
+ PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \
+ ENV{DM_MULTIPATH_DEVICE_PATH}="1"
+
+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{DEVTYPE}!="partition", \
+ RUN+="/usr/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
+
+KERNEL!="dm-*", GOTO="end_mpath"
+ACTION!="change", 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{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode"
-# socket for uevents
-SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event"
+LABEL="end_mpath"

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 11 12:58:05 UTC 2012 - rmilasan@suse.com
- Drop RUN+="socket:..." and update the multipath.rule like Fedora
does.
-------------------------------------------------------------------
Wed May 30 17:32:10 CEST 2012 - hare@suse.de

View File

@ -32,6 +32,7 @@ Group: System/Base
Source: multipath-tools-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: %{name}-%{version}-opensuse-12.2.diff.bz2
Patch1: 0001-multipath.rules.patch
%description
This package provides the tools to manage multipathed devices by
@ -72,6 +73,7 @@ Authors:
%prep
%setup -q -n multipath-tools-%{version}
%patch0 -p1
%patch1 -p1
%build
make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib