2b0cd7cceb
Rebased on top of Martin Wilck's queue of ACKed upstream commits * https://github.com/openSUSE/multipath-tools/tree/upstream-queue * All previous patches have been reordered, with the exception of 0011-libdmmp-Add-support-for-upcoming-json-c-0.14.0.patch which has been replaced with 0029-fix-boolean-value-with-json-c-0.14.patch Modify 0054-RH-add-mpathconf.patch * remove default enable_foreign and property blacklist_exceptions settings, and deal with the builtin default change from 0031-libmultipath-set-enable_foreign-to-NONE-by-default.patch. Fixes bz #1853668 Add 0048-Makefile.inc-trim-extra-information-from-systemd-ver.patch Add 0049-kpartx-fix-Wsign-compare-error.patch * The above two patches have been submitted upstream
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 21 Aug 2019 16:07:12 +0200
|
|
Subject: [PATCH] libmultipath: set "enable_foreign" to NONE by default
|
|
|
|
This has been requested by NetApp.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/defaults.h | 4 ++--
|
|
multipath/multipath.conf.5 | 5 +++--
|
|
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
|
|
index e5ee6afe..01a501bd 100644
|
|
--- a/libmultipath/defaults.h
|
|
+++ b/libmultipath/defaults.h
|
|
@@ -50,8 +50,8 @@
|
|
#define DEFAULT_FIND_MULTIPATHS_TIMEOUT -10
|
|
#define DEFAULT_UNKNOWN_FIND_MULTIPATHS_TIMEOUT 1
|
|
#define DEFAULT_ALL_TG_PT ALL_TG_PT_OFF
|
|
-/* Enable all foreign libraries by default */
|
|
-#define DEFAULT_ENABLE_FOREIGN ""
|
|
+/* Enable no foreign libraries by default */
|
|
+#define DEFAULT_ENABLE_FOREIGN "NONE"
|
|
|
|
#define CHECKINT_UNDEF UINT_MAX
|
|
#define DEFAULT_CHECKINT 5
|
|
diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
|
|
index 05a5e8ff..28cea88c 100644
|
|
--- a/multipath/multipath.conf.5
|
|
+++ b/multipath/multipath.conf.5
|
|
@@ -1228,10 +1228,11 @@ Enables or disables foreign libraries (see section
|
|
.I FOREIGN MULTIPATH SUPPORT
|
|
below). The value is a regular expression; foreign libraries are loaded
|
|
if their name (e.g. \(dqnvme\(dq) matches the expression. By default,
|
|
-all foreign libraries are enabled.
|
|
+no foreign libraries are enabled. Set this to \(dqnvme\(dq to enable NVMe native
|
|
+multipath support, or \(dq.*\(dq to enable all foreign libraries.
|
|
.RS
|
|
.TP
|
|
-The default is: \fB\(dq\(dq\fR (the empty regular expression)
|
|
+The default is: \fB\(dqNONE\(dq\fR
|
|
.RE
|
|
.
|
|
.
|
|
--
|
|
2.17.2
|
|
|