summaryrefslogtreecommitdiffstats
path: root/Incremental.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-07-22 17:43:35 +1000
committerNeilBrown <neilb@suse.de>2010-07-22 17:43:35 +1000
commit8562409dd17ab4910befcbfaba8fe8b751418b6b (patch)
tree188593c4058dbcb31c193ce52603ef94d13f9157 /Incremental.c
parentc43f7d91cc15a1eb202e40e435623bf14dc2adb8 (diff)
parent1dccfff910ce9d854330302b9a34636d63cdac7b (diff)
downloadmdadm-master.tar.gz
mdadm-master.tar.xz
mdadm-master.zip
Merge branch 'master' of git://github.com/djbw/mdadmHEADmaster
Diffstat (limited to 'Incremental.c')
-rw-r--r--Incremental.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/Incremental.c b/Incremental.c
index eb27784..35490e7 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -376,7 +376,16 @@ int Incremental(char *devname, int verbose, int runstop,
* statement about this.
*/
if (runstop < 1) {
- if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) {
+ int active = 0;
+
+ if (st->ss->external) {
+ char *devname = devnum2devname(fd2devnum(mdfd));
+
+ active = devname && is_container_active(devname);
+ free(devname);
+ } else if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0)
+ active = 1;
+ if (active) {
fprintf(stderr, Name
": not adding %s to active array (without --run) %s\n",
devname, chosen_name);