|
 |
671555 |
From 61b2002c6b2752c15b431e400cd614edc8c5b039 Mon Sep 17 00:00:00 2001
|
|
|
671555 |
From: Fabio M. Di Nitto <fdinitto@redhat.com>
|
|
|
671555 |
Date: Mon, 19 Oct 2009 07:05:45 +0200
|
|
|
671555 |
Subject: [PATCH 09/12] RH: multipathd blacklist all by default
|
|
|
671555 |
|
|
|
671555 |
If there is no configuration installed on the system, blacklist
|
|
|
671555 |
everything by default.
|
|
|
671555 |
|
|
|
671555 |
BZ#528059
|
|
|
671555 |
|
|
|
671555 |
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
|
|
|
671555 |
---
|
|
|
671555 |
:100644 100644 e7e962e... 5aa1ab0... M libmultipath/config.c
|
|
|
671555 |
:100644 100644 86b1320... 7e90e75... M libmultipath/config.h
|
|
|
671555 |
libmultipath/config.c | 16 ++++++++++++++++
|
|
|
671555 |
libmultipath/config.h | 1 +
|
|
|
671555 |
2 files changed, 17 insertions(+)
|
|
|
671555 |
|
|
|
671555 |
Index: multipath-tools-130222/libmultipath/config.c
|
|
|
671555 |
===================================================================
|
|
|
671555 |
--- multipath-tools-130222.orig/libmultipath/config.c
|
|
|
671555 |
+++ multipath-tools-130222/libmultipath/config.c
|
|
|
671555 |
@@ -21,6 +21,7 @@
|
|
|
671555 |
#include "defaults.h"
|
|
|
671555 |
#include "prio.h"
|
|
|
671555 |
#include "devmapper.h"
|
|
|
671555 |
+#include "version.h"
|
|
|
671555 |
|
|
|
671555 |
static int
|
|
|
671555 |
hwe_strmatch (struct hwentry *hwe1, struct hwentry *hwe2)
|
|
|
671555 |
@@ -585,6 +586,21 @@ load_config (char * file)
|
|
|
671555 |
|
|
|
671555 |
} else {
|
|
|
671555 |
init_keywords();
|
|
|
671555 |
+ condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
|
|
|
671555 |
+ condlog(0, "A default multipath.conf file is located at");
|
|
|
671555 |
+ condlog(0, "/usr/share/doc/device-mapper-multipath-%d.%d.%d/multipath.conf", MULTIPATH_VERSION(VERSION_CODE));
|
|
|
671555 |
+ if (conf->blist_devnode == NULL) {
|
|
|
671555 |
+ conf->blist_devnode = vector_alloc();
|
|
|
671555 |
+ if (!conf->blist_devnode) {
|
|
|
671555 |
+ condlog(0, "cannot allocate blacklist\n");
|
|
|
671555 |
+ goto out;
|
|
|
671555 |
+ }
|
|
|
671555 |
+ }
|
|
|
671555 |
+ if (store_ble(conf->blist_devnode, strdup(".*"),
|
|
|
671555 |
+ ORIGIN_NO_CONFIG)) {
|
|
|
671555 |
+ condlog(0, "cannot store default no-config blacklist\n");
|
|
|
671555 |
+ goto out;
|
|
|
671555 |
+ }
|
|
|
671555 |
}
|
|
|
671555 |
|
|
|
671555 |
/*
|
|
|
671555 |
Index: multipath-tools-130222/libmultipath/config.h
|
|
|
671555 |
===================================================================
|
|
|
671555 |
--- multipath-tools-130222.orig/libmultipath/config.h
|
|
|
671555 |
+++ multipath-tools-130222/libmultipath/config.h
|
|
|
671555 |
@@ -6,6 +6,7 @@
|
|
|
671555 |
|
|
|
671555 |
#define ORIGIN_DEFAULT 0
|
|
|
671555 |
#define ORIGIN_CONFIG 1
|
|
|
671555 |
+#define ORIGIN_NO_CONFIG 2
|
|
|
671555 |
|
|
|
671555 |
/*
|
|
|
671555 |
* In kernel, fast_io_fail == 0 means immediate failure on rport delete.
|