Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <neilb@suse.de>
This commit is contained in:
NeilBrown 2008-11-03 06:39:02 +11:00
parent 4ebd323711
commit 350ac35d1f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Incremental.c
View File

@ -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;