From 350ac35d1f427c858e4b3169aaffcbaba0db3e30 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 3 Nov 2008 06:39:02 +1100 Subject: [PATCH] Incremental: change precedence order for autof setting. It doesn't really make sense for the --auto setting to ever over-ride the setting on an ARRAY line. That could cause failure if the ARRAY line has a 'standard' now. So revert to the array line having precedence over command line, then CREATE line last. Signed-off-by: NeilBrown --- Incremental.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Incremental.c b/Incremental.c index 7148a73..1d326fd 100644 --- a/Incremental.c +++ b/Incremental.c @@ -40,7 +40,7 @@ int Incremental(char *devname, int verbose, int runstop, struct supertype *st, char *homehost, int autof) { /* Add this device to an array, creating the array if necessary - * and starting the array if sensibe or - if runstop>0 - if possible. + * and starting the array if sensible or - if runstop>0 - if possible. * * This has several steps: * @@ -225,9 +225,10 @@ int Incremental(char *devname, int verbose, int runstop, /* There are three possible sources for 'autof': command line, * ARRAY line in mdadm.conf, or CREATE line in mdadm.conf. - * They have precedence in that order. + * ARRAY takes precedence, then command line, then + * CREATE. */ - if (autof == 0 && match) + if (match && match->autof) autof = match->autof; if (autof == 0) autof = ci->autof;