From 3c6e95c1aa73b54865c96b1c298ce8e405038b00 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 3 Sep 2013 10:05:59 +1000 Subject: [PATCH] Config: multiple occurences of lines is not an error. As we now support config directories it is helpful if lines are allowed to occur multiple times with one over-riding the other. So stop giving warnings when later lines are ignored. Signed-off-by: NeilBrown --- config.c | 22 +++++----------------- mdadm.conf.5 | 13 ++++++++++--- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/config.c b/config.c index 38ed8a2..f0b0138 100644 --- a/config.c +++ b/config.c @@ -507,13 +507,9 @@ void mailline(char *line) { char *w; - for (w=dl_next(line); w != line ; w=dl_next(w)) { + for (w=dl_next(line); w != line ; w=dl_next(w)) if (alert_email == NULL) alert_email = xstrdup(w); - else - pr_err("excess address on MAIL line: %s - ignored\n", - w); - } } static char *alert_mail_from = NULL; @@ -540,13 +536,9 @@ void programline(char *line) { char *w; - for (w=dl_next(line); w != line ; w=dl_next(w)) { + for (w=dl_next(line); w != line ; w=dl_next(w)) if (alert_program == NULL) alert_program = xstrdup(w); - else - pr_err("excess program on PROGRAM line: %s - ignored\n", - w); - } } static char *home_host = NULL; @@ -563,9 +555,7 @@ void homehostline(char *line) home_host = xstrdup(""); else home_host = xstrdup(w); - }else - pr_err("excess host name on HOMEHOST line: %s - ignored\n", - w); + } } } @@ -583,11 +573,9 @@ void autoline(char *line) int homehost = 0; int i; - if (auto_seen) { - pr_err("AUTO line may only be give once." - " Subsequent lines ignored\n"); + if (auto_seen) return; - } + /* Parse the 'auto' line creating policy statements for the 'auto' policy. * * The default is 'yes' but the 'auto' line might over-ride that. diff --git a/mdadm.conf.5 b/mdadm.conf.5 index 6d9b2a4..088e645 100644 --- a/mdadm.conf.5 +++ b/mdadm.conf.5 @@ -256,8 +256,8 @@ mode (and was given the .B \-\-scan option). There should only be one .B MAILADDR -line and it should have only one address. - +line and it should have only one address. Any subsequent addresses +are silently ignored. .TP .B MAILFROM @@ -397,7 +397,9 @@ is given it is also possible to give an explicit name which will be used when creating arrays. This is the only case when there can be more that one other word on the .B HOMEHOST -line. +line. If there are other words, or other +.B HOMEHOST +lines, they are silently ignored. If .B @@ -461,6 +463,11 @@ The known metadata types are .BR ddf , .BR imsm . +.B AUTO +should be given at most once. Subsequent lines are silently ignored. +Thus an earlier config file in a config directory will over-ride +the setting in a later config file. + .TP .B POLICY This is used to specify what automatic behavior is allowed on devices