diff --git a/ChangeLog b/ChangeLog index a868723..0640dc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Changes Prior to 2.5.3 release - Document v0.91 superblocks in md.4 - Make GPL explicit in man pages. + - Fix recent breakage of starting degraded arrays. Changes Prior to 2.5.2 release - Fix problem with compiling with gcc-2 compilers diff --git a/mdadm.c b/mdadm.c index e7c53d4..9fe56ab 100644 --- a/mdadm.c +++ b/mdadm.c @@ -1017,7 +1017,7 @@ int main(int argc, char *argv[]) else { rv |= Assemble(ss, array_list->devname, mdfd, array_list, - devlist, NULL, + NULL, NULL, readonly, runstop, NULL, homehost, verbose-quiet, force); if (rv == 0) cnt++; } @@ -1036,7 +1036,7 @@ int main(int argc, char *argv[]) do { rv2 = Assemble(ss, NULL, -1, &ident, - devlist, NULL, + NULL, NULL, readonly, runstop, NULL, homehost, verbose-quiet, force); if (rv2==0) { cnt++; @@ -1049,7 +1049,6 @@ int main(int argc, char *argv[]) auto_update_home = 0; } while (rv2!=2); /* Incase there are stacked devices, we need to go around again */ - devlist = conf_get_devs(); } while (acnt); if (cnt == 0 && auto_update_home && homehost) { /* Nothing found, maybe we need to bootstrap homehost info */ @@ -1058,7 +1057,7 @@ int main(int argc, char *argv[]) do { rv2 = Assemble(ss, NULL, -1, &ident, - devlist, NULL, + NULL, NULL, readonly, runstop, "homehost", homehost, verbose-quiet, force); if (rv2==0) { cnt++; @@ -1066,7 +1065,6 @@ int main(int argc, char *argv[]) } } while (rv2!=2); /* Incase there are stacked devices, we need to go around again */ - devlist = conf_get_devs(); } while (acnt); } if (cnt == 0 && rv == 0) {