diff options
| author | Benjamin Marzinski <bmarzins@redhat.com> | 2013-03-02 17:03:30 -0600 |
|---|---|---|
| committer | Benjamin Marzinski <bmarzins@redhat.com> | 2013-03-02 17:03:30 -0600 |
| commit | d1207a7795f6efc52e321e735a92d7b3d80aaaba (patch) | |
| tree | bb53dfc9c74896fe5467159dfb92a4fdf774f492 /0002-RH-multipath.rules.patch | |
| parent | 1a1eabcadfe8159ec0373b7a4cf7b2e058ea0db5 (diff) | |
| download | device-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.tar.gz device-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.tar.xz device-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.zip | |
device-mapper-multipath-0.4.9-45
Updated to latest upstrem 0.4.9 code: multipath-tools-130222
(git commit id: 67b82ad6fe280caa1770025a6bb8110b633fa136)
Refresh 0001-RH-dont_start_with_no_config.patch
Modify 0002-RH-multipath.rules.patch
Modify 0003-RH-Make-build-system-RH-Fedora-friendly.patch
Refresh 0004-RH-multipathd-blacklist-all-by-default.patch
Refresh 0005-RH-add-mpathconf.patch
Refresh 0006-RH-add-find-multipaths.patch
Add 0008-RH-revert-partition-changes.patch
Rename 0008-RH-RHEL5-style-partitions.patch to
0009-RH-RHEL5-style-partitions.patch
Rename 0009-RH-dont-remove-map-on-enomem.patch to
0010-RH-dont-remove-map-on-enomem.patch
Rename 0010-RH-deprecate-uid-gid-mode.patch to
0011-RH-deprecate-uid-gid-mode.patch
Rename 0013-RH-kpartx-msg.patch to 0012-RH-kpartx-msg.patch
Rename 0035-RHBZ-883981-cleanup-rpmdiff-issues.patch to
0013-RHBZ-883981-cleanup-rpmdiff-issues.patch
Rename 0039-RH-handle-other-sector-sizes.patch to
0014-RH-handle-other-sector-sizes.patch
Rename 0040-RH-fix-output-buffer.patch to 0015-RH-fix-output-buffer.patch
Add 0016-RH-dont-print-ghost-messages.patch
Add 0017-RH-fix-sigusr1.patch
* Actually this fixes a number of issues related to signals
Rename 0018-RH-remove-config-dups.patch to 0018-RH-fix-factorize.patch
* just the part that isn't upstream
Add 0019-RH-fix-sockets.patch
* makes abstract multipathd a cli sockets use the correct name.
Set find_multipaths in the default config
Diffstat (limited to '0002-RH-multipath.rules.patch')
| -rw-r--r-- | 0002-RH-multipath.rules.patch | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/0002-RH-multipath.rules.patch b/0002-RH-multipath.rules.patch index 32eee62..a910dc1 100644 --- a/0002-RH-multipath.rules.patch +++ b/0002-RH-multipath.rules.patch @@ -1,23 +1,17 @@ --- - multipath/Makefile | 6 +++--- - multipath/multipath.rules | 29 +++++++++++++++++++++++------ - 2 files changed, 26 insertions(+), 9 deletions(-) + multipath/Makefile | 3 +++ + multipath/multipath.rules | 24 ++++++++++++++++++++++++ + 2 files changed, 27 insertions(+) -Index: multipath-tools-120821/multipath/multipath.rules +Index: multipath-tools-130222/multipath/multipath.rules =================================================================== ---- multipath-tools-120821.orig/multipath/multipath.rules -+++ multipath-tools-120821/multipath/multipath.rules -@@ -1,7 +1,24 @@ --# --# udev rules for multipathing. --# The persistent symlinks are created with the kpartx rules --# +--- /dev/null ++++ multipath-tools-130222/multipath/multipath.rules +@@ -0,0 +1,24 @@ +# 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" + @@ -31,23 +25,21 @@ Index: multipath-tools-120821/multipath/multipath.rules + RUN+="/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" ++ACTION!="change", GOTO="end_mpath" +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" ++RUN+="$env{MPATH_SBIN_PATH}/kpartx -a $tempnode" +LABEL="end_mpath" -Index: multipath-tools-120821/multipath/Makefile +Index: multipath-tools-130222/multipath/Makefile =================================================================== ---- multipath-tools-120821.orig/multipath/Makefile -+++ multipath-tools-120821/multipath/Makefile -@@ -21,15 +21,15 @@ $(EXEC): $(OBJS) +--- multipath-tools-130222.orig/multipath/Makefile ++++ multipath-tools-130222/multipath/Makefile +@@ -21,12 +21,15 @@ $(EXEC): $(OBJS) install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -- $(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/62-multipath.rules $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) @@ -56,7 +48,6 @@ Index: multipath-tools-120821/multipath/Makefile $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) uninstall: -- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules + rm $(DESTDIR)/lib/udev/rules.d/62-multipath.rules rm $(DESTDIR)$(bindir)/$(EXEC) rm $(DESTDIR)$(mandir)/$(EXEC).8.gz |