summaryrefslogtreecommitdiffstats
path: root/mdadm.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2006-08-07 11:13:01 +1000
committerNeil Brown <neilb@suse.de>2006-08-07 11:13:01 +1000
commit43f2372a034d49a9512685c5aacfcdfc67665580 (patch)
treed5f9ad60a11c862e56226412f71dedd432e35e90 /mdadm.c
parent90fc992e4eb2e23fa9855737736bd12c0c72d366 (diff)
downloadmdadm-43f2372a034d49a9512685c5aacfcdfc67665580.tar.gz
mdadm-43f2372a034d49a9512685c5aacfcdfc67665580.tar.xz
mdadm-43f2372a034d49a9512685c5aacfcdfc67665580.zip
Fix starting of degraded arrays.
Recent change broke assembling of degraded arrays, making it require --run. This fixes that.
Diffstat (limited to 'mdadm.c')
-rw-r--r--mdadm.c8
1 files changed, 3 insertions, 5 deletions
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) {