diff options
| author | NeilBrown <neilb@suse.de> | 2008-11-03 06:40:12 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2008-11-03 06:40:12 +1100 |
| commit | 2eb91c81d8da5cfdc36c93d8daf405c95e8bac2f (patch) | |
| tree | b9fe0298a6db301fc6f604a9bfb75e60879718de /Incremental.c | |
| parent | 9c3220067be02b5ef4da6e51ec91f928572d5223 (diff) | |
| parent | 350ac35d1f427c858e4b3169aaffcbaba0db3e30 (diff) | |
| download | mdadm-2eb91c81d8da5cfdc36c93d8daf405c95e8bac2f.tar.gz mdadm-2eb91c81d8da5cfdc36c93d8daf405c95e8bac2f.tar.xz mdadm-2eb91c81d8da5cfdc36c93d8daf405c95e8bac2f.zip | |
Merge branch 'master' into scratch-3.0
Diffstat (limited to 'Incremental.c')
| -rw-r--r-- | Incremental.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Incremental.c b/Incremental.c index cea693a..707fd05 100644 --- a/Incremental.c +++ b/Incremental.c @@ -244,9 +244,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; |