b0ec4a42c8
Modify 0021-RHBZ-548874-add-find-multipaths.patch
Modify 0022-RHBZ-557845-RHEL5-style-partitions.patch
Add 0025-RHBZ-508827-update-multipathd-manpage.patch through
0101-RHBZ-631009-disable-udev-disk-rules-on-reload.patch
* sync with current state of RHEL6. Next release should include a updated
source tarball with most of these fixes rolled in.
Add 0102-RHBZ-690828-systemd-unit-file.patch
* Add Jóhann B. Guðmundsson's unit file for systemd.
* Add sub-package sysvinit for SysV init script.
Resolves: bz #690828
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
---
|
|
multipath/mpathconf | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
Index: multipath-tools/multipath/mpathconf
|
|
===================================================================
|
|
--- multipath-tools.orig/multipath/mpathconf
|
|
+++ multipath-tools/multipath/mpathconf
|
|
@@ -17,6 +17,8 @@
|
|
# This program was largely ripped off from lvmconf
|
|
#
|
|
|
|
+unset ENABLE FIND FRIENDLY MODULE MULTIPATHD CHKCONFIG HAVE_DISABLE HAVE_FIND HAVE_BLACKLIST HAVE_DEFAULTS HAVE_FRIENDLY HAVE_MULTIPATHD HAVE_CHKCONFIG HAVE_MODULE SHOW_STATUS CHANGED_CONFIG
|
|
+
|
|
DEFAULT_CONFIGFILE="/usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf"
|
|
CONFIGFILE="/etc/multipath.conf"
|
|
MULTIPATHDIR="/etc/multipath"
|
|
@@ -118,7 +120,7 @@ function validate_args
|
|
exit 1
|
|
fi
|
|
if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" ]; then
|
|
- DISPLAY=1
|
|
+ SHOW_STATUS=1
|
|
fi
|
|
if [ -n "$MODULE" ] && [ "$MODULE" != "y" -a "$MODULE" != "n" ]; then
|
|
echo "--with_module must be either 'y' or 'n'"
|
|
@@ -211,7 +213,7 @@ if [ "$HAVE_DEFAULTS" = "1" ]; then
|
|
fi
|
|
fi
|
|
|
|
-if [ -n "$DISPLAY" ]; then
|
|
+if [ -n "$SHOW_STATUS" ]; then
|
|
if [ -z "$HAVE_DISABLE" -o "$HAVE_DISABLE" = 0 ]; then
|
|
echo "multipath is enabled"
|
|
else
|