@@ -168,7 +168,6 @@ struct config {
int strict_timing;
int retrigger_tries;
int retrigger_delay;
- int ignore_new_devs;
int delayed_reconfig;
int uev_wait_timeout;
int skip_kpartx;
@@ -278,7 +278,7 @@ should_multipath(struct path *pp1, vector pathvec, vector mpvec)
struct config *conf;
conf = get_multipath_config();
- ignore_new_devs = conf->ignore_new_devs;
+ ignore_new_devs = !conf->ignore_wwids;
if (!conf->find_multipaths && !ignore_new_devs) {
put_multipath_config(conf);
return 1;
@@ -107,7 +107,6 @@ int logsink;
int uxsock_timeout;
int verbosity;
int bindings_read_only;
-int ignore_new_devs;
enum daemon_status running_state = DAEMON_INIT;
pid_t daemon_pid;
pthread_mutex_t config_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -2131,8 +2130,6 @@ reconfigure (struct vectors * vecs)
conf->verbosity = verbosity;
if (bindings_read_only)
conf->bindings_read_only = bindings_read_only;
- if (ignore_new_devs)
- conf->ignore_new_devs = ignore_new_devs;
uxsock_timeout = conf->uxsock_timeout;
old = rcu_dereference(multipath_conf);
@@ -2357,8 +2354,6 @@ child (void * param)
conf->verbosity = verbosity;
if (bindings_read_only)
conf->bindings_read_only = bindings_read_only;
- if (ignore_new_devs)
- conf->ignore_new_devs = ignore_new_devs;
uxsock_timeout = conf->uxsock_timeout;
rcu_assign_pointer(multipath_conf, conf);
if (init_checkers(conf->multipath_dir)) {
@@ -2691,7 +2686,7 @@ main (int argc, char *argv[])
bindings_read_only = 1;
break;
case 'n':
- ignore_new_devs = 1;
+ condlog(0, "WARNING: ignoring deprecated option -n, use 'ignore_wwids = no' instead");
break;
default:
fprintf(stderr, "Invalid argument '-%c'\n",