diff options
author | NeilBrown <neilb@suse.de> | 2008-11-20 17:02:55 +1100 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2008-11-20 17:02:55 +1100 |
commit | a30b2ecd4a4215b0c0017edc6df538c264a97e85 (patch) | |
tree | 7884dd2ba88af4acdc911307d687a2688e924874 /mdadm.c | |
parent | e8a70c89585ddca2bcb4160808f64506c64df13b (diff) | |
download | mdadm-a30b2ecd4a4215b0c0017edc6df538c264a97e85.tar.gz mdadm-a30b2ecd4a4215b0c0017edc6df538c264a97e85.tar.xz mdadm-a30b2ecd4a4215b0c0017edc6df538c264a97e85.zip |
Assemble: don't auto-assemble if any arrays are listed in mdadm.conf
Auto-assembly and planned assembly don't really work well together,
it can be confusing.
In particular in mkinitrd or similar creates an mdadm.conf to
assemble a particular array, we shouldn't go assembling any
other arrays as well.
If you want auto assembly, you need to give mdadm a config
file with no ARRAY lines.
mdadm -Ascpartitions
can do this.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'mdadm.c')
-rw-r--r-- | mdadm.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1092,9 +1092,9 @@ int main(int argc, char *argv[]) array_list, NULL, NULL, readonly, runstop, NULL, homehost, verbose-quiet, force); - if (rv == 0) cnt++; + cnt++; } - if (homehost) { + if (homehost && cnt == 0) { /* Maybe we can auto-assemble something. * Repeatedly call Assemble in auto-assemble mode * until it fails |