device-mapper-multipath/0021-RHBZ-919119-respect-kernel-cmdline.patch
Benjamin Marzinski 816bea4c19 device-mapper-multipath-0.4.9-47
Add 0021-RHBZ-919119-respect-kernel-cmdline.patch
  * keep the multipath.rules udev file from running and multipathd from
    starting if nompath is on the kernel command line
Add 0022-RH-multipathd-check-wwids.patch
  * Whenever multipath runs configure, it will check the wwids, and
    add any missing ones to the wwids file
Add 0023-RH-multipath-wipe-wwid.patch
  * multipath's -w command will remove a wwid from the wwids file
Add 0024-RH-multipath-wipe-wwids.patch
  * multipath's -W command will set reset the wwids file to just the current
    devices
Add 0025-UPBZ-916668_add_maj_min.patch
Resolves: bz #919119
2013-04-01 14:17:27 -05:00

31 lines
1.1 KiB
Diff

---
multipath/multipath.rules | 2 ++
multipathd/multipathd.service | 1 +
2 files changed, 3 insertions(+)
Index: multipath-tools-130222/multipath/multipath.rules
===================================================================
--- multipath-tools-130222.orig/multipath/multipath.rules
+++ multipath-tools-130222/multipath/multipath.rules
@@ -2,6 +2,8 @@
# so name them after their devmap name
SUBSYSTEM!="block", GOTO="end_mpath"
+IMPORT{cmdline}="nompath"
+ENV{nompath}=="?*", GOTO="end_mpath"
ENV{MPATH_SBIN_PATH}="/sbin"
TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin"
Index: multipath-tools-130222/multipathd/multipathd.service
===================================================================
--- multipath-tools-130222.orig/multipathd/multipathd.service
+++ multipath-tools-130222/multipathd/multipathd.service
@@ -3,6 +3,7 @@ Description=Device-Mapper Multipath Devi
Before=iscsi.service iscsid.service lvm2-activation-early.service
After=syslog.target
ConditionPathExists=/etc/multipath.conf
+ConditionKernelCommandLine=!nompath
DefaultDependencies=no
Conflicts=shutdown.target