diff options
author | Neil Brown <neilb@suse.de> | 2005-06-14 06:33:02 +0000 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2005-06-14 06:33:02 +0000 |
commit | 1337546dc1f4b4dfd399ecb9ef05e0936492220f (patch) | |
tree | 5c9a44f94759b83816325de0537d098f074d3adc /mdadm.c | |
parent | 92919398cc8dcd8f9cd41a91b3b6af8d569d95fb (diff) | |
download | mdadm-1337546dc1f4b4dfd399ecb9ef05e0936492220f.tar.gz mdadm-1337546dc1f4b4dfd399ecb9ef05e0936492220f.tar.xz mdadm-1337546dc1f4b4dfd399ecb9ef05e0936492220f.zip |
Allow --auto to still be meaningful when --scan is given
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Diffstat (limited to 'mdadm.c')
-rw-r--r-- | mdadm.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -821,7 +821,8 @@ int main(int argc, char *argv[]) devlist->devname); rv |= 1; } else { - mdfd = open_mddev(devlist->devname, array_ident->autof); + mdfd = open_mddev(devlist->devname, + array_ident->autof ? array_ident->autof : autof); if (mdfd < 0) rv |= 1; else { @@ -848,7 +849,8 @@ int main(int argc, char *argv[]) rv |= 1; continue; } - mdfd = open_mddev(dv->devname, array_ident->autof); + mdfd = open_mddev(dv->devname, + array_ident->autof ?array_ident->autof : autof); if (mdfd < 0) { rv |= 1; continue; @@ -866,7 +868,8 @@ int main(int argc, char *argv[]) } else for (; array_list; array_list = array_list->next) { mdu_array_info_t array; - mdfd = open_mddev(array_list->devname, array_list->autof); + mdfd = open_mddev(array_list->devname, + array_list->autof ? array_list->autof : autof); if (mdfd < 0) { rv |= 1; continue; |