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
83 lines
2.5 KiB
Diff
83 lines
2.5 KiB
Diff
---
|
|
multipath/mpathconf | 26 ++++++++++++++++++++------
|
|
multipath/mpathconf.8 | 16 +++++++---------
|
|
2 files changed, 27 insertions(+), 15 deletions(-)
|
|
|
|
Index: multipath-tools-130222/multipath/mpathconf
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipath/mpathconf
|
|
+++ multipath-tools-130222/multipath/mpathconf
|
|
@@ -19,10 +19,27 @@
|
|
|
|
unset ENABLE FIND FRIENDLY MODULE MULTIPATHD HAVE_DISABLE HAVE_FIND HAVE_BLACKLIST HAVE_DEFAULTS HAVE_FRIENDLY HAVE_MULTIPATHD HAVE_MODULE SHOW_STATUS CHANGED_CONFIG
|
|
|
|
-DEFAULT_CONFIGFILE="/usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf"
|
|
+DEFAULT_CONFIG="# device-mapper-multipath configuration file
|
|
+
|
|
+# For a complete list of the default configuration values, run either:
|
|
+# # multipath -t
|
|
+# or
|
|
+# # multipathd show config
|
|
+
|
|
+# For a list of configuration options with descriptions, see the
|
|
+# multipath.conf man page.
|
|
+
|
|
+# For an example configuration file, see:
|
|
+# /user/share/doc/device-mapper-multipath/multipath.conf
|
|
+
|
|
+defaults {
|
|
+ user_friendly_names yes
|
|
+ find_multipaths yes
|
|
+}"
|
|
+
|
|
CONFIGFILE="/etc/multipath.conf"
|
|
MULTIPATHDIR="/etc/multipath"
|
|
-TMPFILE=/etc/multipath/.multipath.conf.tmp
|
|
+TMPFILE="/etc/multipath/.multipath.conf.tmp"
|
|
|
|
function usage
|
|
{
|
|
@@ -134,12 +151,9 @@ if [ ! -d "$MULTIPATHDIR" ]; then
|
|
fi
|
|
|
|
rm $TMPFILE 2> /dev/null
|
|
+echo "$DEFAULT_CONFIG" > $TMPFILE
|
|
if [ -f "$CONFIGFILE" ]; then
|
|
cp $CONFIGFILE $TMPFILE
|
|
-elif [ -f "$DEFAULT_CONFIGFILE" ]; then
|
|
- cp $DEFAULT_CONFIGFILE $TMPFILE
|
|
-else
|
|
- touch $TMPFILE
|
|
fi
|
|
|
|
if grep -q "^blacklist[[:space:]]*{" $TMPFILE ; then
|
|
Index: multipath-tools-130222/multipath/mpathconf.8
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipath/mpathconf.8
|
|
+++ multipath-tools-130222/multipath/mpathconf.8
|
|
@@ -34,17 +34,15 @@ that users can manually edit their confi
|
|
If
|
|
.B /etc/multipath.conf
|
|
already exists, mpathconf will edit it. If it does not exist, mpathconf will
|
|
-use
|
|
-.B /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf
|
|
-as the starting file. This file has
|
|
+create a default file with
|
|
.B user_friendly_names
|
|
-set. If this file does not exist, mpathconf will create
|
|
-.B /etc/multipath.conf
|
|
-from scratch. For most users, this means that
|
|
-.B user_friendly_names
|
|
-will be set by default, unless they use the
|
|
+and
|
|
+.B find_multipaths
|
|
+set. To disable these, use the
|
|
.B --user_friendly_names n
|
|
-command.
|
|
+and
|
|
+.B --find_multipaths n
|
|
+options
|
|
.SH COMMANDS
|
|
.TP
|
|
.B --enable
|