pool/multipath-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 128191 from Base:System

Browse Source 
- Drop patch 0001-multipath.rules.patch, multipath not ready yet.

- Fix the installation of multipath.rules file.

OBS-URL: https://build.opensuse.org/request/show/128191
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=50
This commit is contained in:
Stephan Kulow 2012-07-18 15:33:55 +00:00 committed by Git OBS Bridge
commit 4bd7973d21
4 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-multipath.rules.patch
View File

@ -1,35 +0,0 @@
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"

21
0002-fix-installation-of-multipath-rule.patch Normal file
View File

@ -0,0 +1,21 @@
Index: multipath-tools-0.4.9/multipath/Makefile
===================================================================
--- multipath-tools-0.4.9.orig/multipath/Makefile
+++ multipath-tools-0.4.9/multipath/Makefile
@@ -22,6 +22,7 @@ install:
$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
$(INSTALL_PROGRAM) -m 755 multipath.init.suse $(DESTDIR)$(rcdir)/boot.multipath
$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/71-multipath.rules
$(INSTALL_PROGRAM) -d $(DESTDIR)$(mkinitrddir)
$(INSTALL_PROGRAM) -m 755 boot-multipath.sh $(DESTDIR)$(mkinitrddir)
$(INSTALL_PROGRAM) -m 755 setup-multipath.sh $(DESTDIR)$(mkinitrddir)
@@ -31,7 +32,7 @@ install:
$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
uninstall:
- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
+ rm $(DESTDIR)/etc/udev/rules.d/71-multipath.rules
rm $(DESTDIR)$(bindir)/$(EXEC)
rm $(DESTDIR)$(mandir)/$(EXEC).8
rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5

10
multipath-tools.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Jul 17 13:21:47 UTC 2012 - rmilasan@suse.com
- Drop patch 0001-multipath.rules.patch, multipath not ready yet.
-------------------------------------------------------------------
Tue Jul 17 12:43:43 UTC 2012 - rmilasan@suse.com
- Fix the installation of multipath.rules file.
-------------------------------------------------------------------
Mon Jun 11 12:58:05 UTC 2012 - rmilasan@suse.com

3
multipath-tools.spec
View File

@ -32,7 +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
Patch1: 0002-fix-installation-of-multipath-rule.patch
%description
This package provides the tools to manage multipathed devices by
@ -132,6 +132,7 @@ fi
%dir /etc/udev/rules.d
%config /etc/init.d/multipathd
%config /etc/init.d/boot.multipath
%config /etc/udev/rules.d/71-multipath.rules
/%{_lib}/libmultipath.so.0
/%{_lib}/libmpathpersist.so.0
/%{_lib}/multipath