6738b34a0b
- Modify 0005-RH-add-mpathconf.patch
* changed warning message
- Modify 0102-RHBZ-1160478-mpathconf-template.patch
* updated man page
- Modify 0104-RHBZ-631009-deferred-remove.patch
* refactor code and minor fix
- Refresh 0107-RHBZ-1169935-no-new-devs.patch
- Refresh 0112-RHBZ-1194917-add-config_dir-option.patch
- Refresh 0126-RHBZ-1211383-alias-collision.patch
- Add 0133-RHBZ-1296979-fix-define.patch
* look for the correct libudev function to set define
- Add 0134-RHBZ-1241528-check-mpath-prefix.patch
* only touch devices with a "mpath-" dm uuid prefix
- Add 0135-RHBZ-1299600-path-dev-uevents.patch
* trigger path uevent the first time a path is claimed by multipath
- Add 0136-RHBZ-1304687-wait-for-map-add.patch
* wait for the device to finish being added before reloading it.
- Add 0137-RHBZ-1280524-clear-chkr-msg.patch
- Add 0138-RHBZ-1288660-fix-mpathconf-allow.patch
* don't remove existing lines from blacklist_exceptions section
- Add 0139-RHBZ-1273173-queue-no-daemon-doc.patch
- Add 0140-RHBZ-1299647-fix-help.patch
- Add 0141-RHBZ-1303953-mpathpersist-typo.patch
- Add 0142-RHBZ-1283750-kpartx-fix.patch
* only remove devices if their uuid says that they are the correct
partition device
- Add 0143-RHBZ-1299648-kpartx-sync.patch
* default to using udev sync mode
- Add 0144-RHBZ-1299652-alua-pref-arg.patch
* allow "exclusive_pref_bit" argument to alua prioritizer
- Add 0145-UP-resize-help-msg.patch
- Add 0146-UPBZ-1299651-raw-output.patch
* allow raw format mutipathd show commands, that remove headers and padding
- Add 0147-RHBZ-1272620-fail-rm-msg.patch
- Add 0148-RHBZ-1292599-verify-before-remove.patch
* verify that all partitions are unused before attempting to remove a device
- Add 0149-RHBZ-1292599-restore-removed-parts.patch
* don't disable kpartx when restoring the first path of a device.
- Add 0150-RHBZ-1253913-fix-startup-msg.patch
* wait for multipathd daemon to write pidfile before returning
- Add 0151-RHBZ-1297456-weighted-fix.patch
* add wwn keyword to weighted prioritizer for persistent naming
- Add 0152-RHBZ-1269293-fix-blk-unit-file.patch
* use "Wants" instead of "Requires"
- Add 0153-RH-fix-i686-size-bug.patch
* use 64-bit keycodes for multipathd client commands
- Add 0154-UPBZ-1291406-disable-reinstate.patch
* don't automatically reinstate ghost paths for implicit alua devices
- Add 0155-UPBZ-1300415-PURE-config.patch
* Add default config for PURE FlashArray
- Add 0156-UPBZ-1313324-dont-fail-discovery.patch
* don't fail discovery because individual paths failed.
- Add 0157-RHBZ-1319853-multipath-c-error-msg.patch
* better error reporting for multipath -c
- Add 0158-RHBZ-1318581-timestamp-doc-fix.patch
* add documentation for -T
- Add 0159-UPBZ-1255885-udev-waits.patch
* make multipath and kpartx wait after for udev after each command
87 lines
2.0 KiB
Diff
87 lines
2.0 KiB
Diff
---
|
|
multipath/mpathconf | 37 ++++++++++++++++++++++++++-----------
|
|
1 file changed, 26 insertions(+), 11 deletions(-)
|
|
|
|
Index: multipath-tools-130222/multipath/mpathconf
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipath/mpathconf
|
|
+++ multipath-tools-130222/multipath/mpathconf
|
|
@@ -59,6 +59,19 @@ function usage
|
|
echo ""
|
|
}
|
|
|
|
+function add_wwid
|
|
+{
|
|
+ INDEX=0
|
|
+ while [ "$INDEX" -lt "$WWIDS" ] ; do
|
|
+ if [ "$1" = "${WWID_LIST[$INDEX]}" ] ; then
|
|
+ return
|
|
+ fi
|
|
+ ((INDEX++))
|
|
+ done
|
|
+ WWID_LIST[$WWIDS]="$1"
|
|
+ ((WWIDS++))
|
|
+}
|
|
+
|
|
function get_dm_deps
|
|
{
|
|
shift 3
|
|
@@ -76,11 +89,9 @@ function get_dm_deps
|
|
function set_dm_wwid
|
|
{
|
|
if [[ "$1" =~ ^part[[:digit:]]+-mpath- ]] ; then
|
|
- WWID_LIST[$WWIDS]="${1##part*-mpath-}"
|
|
- ((WWIDS++))
|
|
+ add_wwid "${1##part*-mpath-}"
|
|
elif [[ "$1" =~ ^mpath- ]] ; then
|
|
- WWID_LIST[$WWIDS]="${1##mpath-}"
|
|
- ((WWIDS++))
|
|
+ add_wwid "${1##mpath-}"
|
|
else
|
|
get_dm_deps `dmsetup deps -u $1`
|
|
fi
|
|
@@ -99,8 +110,7 @@ function set_wwid
|
|
if [ -n "$UUID" ] ; then
|
|
set_dm_wwid $UUID
|
|
else
|
|
- WWID_LIST[$WWIDS]="$1"
|
|
- ((WWIDS++))
|
|
+ add_wwid "$1"
|
|
fi
|
|
}
|
|
|
|
@@ -215,13 +225,13 @@ function validate_args
|
|
|
|
function add_blacklist_exceptions
|
|
{
|
|
- echo "blacklist_exceptions {" >> $TMPFILE
|
|
INDEX=0
|
|
while [ "$INDEX" -lt "$WWIDS" ] ; do
|
|
- echo " wwid \"${WWID_LIST[$INDEX]}\"" >> $TMPFILE
|
|
+ sed -i '/^blacklist_exceptions[[:space:]]*{/ a\
|
|
+ wwid '"\"${WWID_LIST[$INDEX]}\""'
|
|
+' $TMPFILE
|
|
((INDEX++))
|
|
done
|
|
- echo "}" >> $TMPFILE
|
|
}
|
|
|
|
umask 0077
|
|
@@ -364,9 +374,14 @@ if [ "$ENABLE" = 2 ]; then
|
|
sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*wwid \"\.\?\*\"/ wwid ".*"/' $TMPFILE
|
|
fi
|
|
if [ "$HAVE_EXCEPTIONS" = 1 ]; then
|
|
- sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/d' $TMPFILE
|
|
+ sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ {/^[[:space:]]*wwid/ d}' $TMPFILE
|
|
+ else
|
|
+ cat >> $TMPFILE <<- _EOF_
|
|
+
|
|
+blacklist_exceptions {
|
|
+}
|
|
+_EOF_
|
|
fi
|
|
- echo $HAVE_WWID_DISABLE
|
|
add_blacklist_exceptions
|
|
elif [ "$ENABLE" = 1 ]; then
|
|
if [ "$HAVE_DISABLE" = 1 ]; then
|