summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-11-22 16:28:00 +1100
committerNeilBrown <neilb@suse.de>2012-11-22 16:28:00 +1100
commit13f2dd6be5618ff556f9a364903e4b95558115e1 (patch)
tree66bdec225028bd10b79f8cefd15d40cc6ab796a4 /config.c
parent639c3c103a380a63457583cbbbaacf5aa37f7802 (diff)
conf: allow multiple arrays to be <ignore>d
We currently complain if mdadm.conf contains multiple definitions for the same name. Unfortunately this stops multiple arrays from being <ignored>d. So exclude "<ignore>" from the duplicate-names test. Reported-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/config.c b/config.c
index 656d4e2f..8461309a 100644
--- a/config.c
+++ b/config.c
@@ -1095,6 +1095,8 @@ int conf_verify_devnames(struct mddev_ident *array_list)
for (a1 = array_list; a1; a1 = a1->next) {
if (!a1->devname)
continue;
+ if (strcmp(a1->devname, "<ignore>") == 0)
+ continue;
for (a2 = a1->next; a2; a2 = a2->next) {
if (!a2->devname)
continue;