int re_add = 0;
char *shortopt = short_options;
int dosyslog = 0;
+ int auto_update_home = 0;
int copies;
int print_help = 0;
case 'a':
case 'r':
case 'f':
- case 6: /* re-add */
+ case ReAdd: /* re-add */
if (!mode) {
newmode = MANAGE;
shortopt = short_bitmap_auto_options;
dv->disposition = devmode;
dv->writemostly = writemostly;
dv->re_add = re_add;
+ dv->used = 0;
dv->next = NULL;
*devlistend = dv;
devlistend = &dv->next;
}
continue;
+ case O(ASSEMBLE,AutoHomeHost):
+ auto_update_home = 1;
+ continue;
case O(CREATE,'e'):
case O(ASSEMBLE,'e'):
case O(MISC,'e'): /* set metadata (superblock) information */
continue;
if (strcmp(update, "uuid")==0)
continue;
+ if (strcmp(update, "name")==0)
+ continue;
+ if (strcmp(update, "homehost")==0)
+ continue;
if (strcmp(update, "byteorder")==0) {
if (ss) {
fprintf(stderr, Name ": must not set metadata type with --update=byteorder.\n");
exit(2);
}
configfile = optarg;
+ set_conffile(configfile);
/* FIXME possibly check that config file exists. Even parse it */
continue;
case O(ASSEMBLE,'s'): /* scan */
fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");
exit(2);
}
+ if (mode == MANAGE || mode == GROW)
+ autof=1; /* Don't create */
mdfd = open_mddev(devlist->devname, autof);
if (mdfd < 0)
exit(1);
}
if (homehost == NULL)
- homehost = conf_get_homehost(configfile);
+ homehost = conf_get_homehost();
if (homehost && strcmp(homehost, "<system>")==0) {
if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) {
sys_hostname[sizeof(sys_hostname)-1] = 0;
if (!rv && readonly < 0)
rv = Manage_ro(devlist->devname, mdfd, readonly);
if (!rv && runstop)
- rv = Manage_runstop(devlist->devname, mdfd, runstop, 0);
+ rv = Manage_runstop(devlist->devname, mdfd, runstop, quiet);
break;
case ASSEMBLE:
if (devs_found == 1 && ident.uuid_set == 0 &&
ident.super_minor == UnSet && ident.name[0] == 0 && !scan ) {
/* Only a device has been given, so get details from config file */
- mddev_ident_t array_ident = conf_get_ident(configfile, devlist->devname);
+ mddev_ident_t array_ident = conf_get_ident(devlist->devname);
if (array_ident == NULL) {
fprintf(stderr, Name ": %s not identified in config file.\n",
devlist->devname);
if (mdfd < 0)
rv |= 1;
else {
- rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile,
+ rv |= Assemble(ss, devlist->devname, mdfd, array_ident,
NULL, backup_file,
- readonly, runstop, update, verbose-quiet, force);
+ readonly, runstop, update, homehost, verbose-quiet, force);
close(mdfd);
}
}
} else if (!scan)
- rv = Assemble(ss, devlist->devname, mdfd, &ident, configfile,
+ rv = Assemble(ss, devlist->devname, mdfd, &ident,
devlist->next, backup_file,
- readonly, runstop, update, verbose-quiet, force);
+ readonly, runstop, update, homehost, verbose-quiet, force);
else if (devs_found>0) {
if (update && devs_found > 1) {
fprintf(stderr, Name ": can only update a single array at a time\n");
exit(1);
}
for (dv = devlist ; dv ; dv=dv->next) {
- mddev_ident_t array_ident = conf_get_ident(configfile, dv->devname);
+ mddev_ident_t array_ident = conf_get_ident(dv->devname);
if (array_ident == NULL) {
fprintf(stderr, Name ": %s not identified in config file.\n",
dv->devname);
rv |= 1;
continue;
}
- rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile,
+ rv |= Assemble(ss, dv->devname, mdfd, array_ident,
NULL, backup_file,
- readonly, runstop, update, verbose-quiet, force);
+ readonly, runstop, update, homehost, verbose-quiet, force);
close(mdfd);
}
} else {
- mddev_ident_t array_list = conf_get_ident(configfile, NULL);
- if (!array_list) {
- fprintf(stderr, Name ": No arrays found in config file\n");
- rv = 1;
- } else
- if (update) {
- fprintf(stderr, Name ": --update not meaningful with a --scan assembly.\n");
- exit(1);
+ mddev_ident_t array_list = conf_get_ident(NULL);
+ mddev_dev_t devlist = conf_get_devs();
+ int cnt = 0;
+ if (devlist == NULL) {
+ fprintf(stderr, Name ": No devices listed in conf file were found.\n");
+ exit(1);
+ }
+ if (update) {
+ fprintf(stderr, Name ": --update not meaningful with a --scan assembly.\n");
+ exit(1);
+ }
+ if (backup_file) {
+ fprintf(stderr, Name ": --backup_file not meaningful with a --scan assembly.\n");
+ exit(1);
+ }
+ for (; array_list; array_list = array_list->next) {
+ mdu_array_info_t array;
+ mdfd = open_mddev(array_list->devname,
+ array_list->autof ? array_list->autof : autof);
+ if (mdfd < 0) {
+ rv |= 1;
+ continue;
}
- if (backup_file) {
- fprintf(stderr, Name ": --backup_file not meaningful with a --scan assembly.\n");
- exit(1);
+ if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
+ /* already assembled, skip */
+ ;
+ else {
+ rv |= Assemble(ss, array_list->devname, mdfd,
+ array_list,
+ devlist, NULL,
+ readonly, runstop, NULL, homehost, verbose-quiet, force);
+ if (rv == 0) cnt++;
}
- for (; array_list; array_list = array_list->next) {
- mdu_array_info_t array;
- mdfd = open_mddev(array_list->devname,
- array_list->autof ? array_list->autof : autof);
- if (mdfd < 0) {
- rv |= 1;
- continue;
- }
- if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
- /* already assembled, skip */
- ;
- else
- rv |= Assemble(ss, array_list->devname, mdfd,
- array_list, configfile,
- NULL, NULL,
- readonly, runstop, NULL, verbose-quiet, force);
- close(mdfd);
+ close(mdfd);
+ }
+ if (homehost) {
+ /* Maybe we can auto-assemble something.
+ * Repeatedly call Assemble in auto-assmble mode
+ * until it fails
+ */
+ int rv2;
+ int acnt;
+ ident.autof = autof;
+ do {
+ acnt = 0;
+ do {
+ rv2 = Assemble(ss, NULL, -1,
+ &ident,
+ devlist, NULL,
+ readonly, runstop, NULL, homehost, verbose-quiet, force);
+ if (rv2==0) {
+ cnt++;
+ acnt++;
+ }
+ if (rv2 == 1)
+ /* found something so even though assembly failed we
+ * want to avoid auto-updates
+ */
+ 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 */
+ do {
+ acnt = 0;
+ do {
+ rv2 = Assemble(ss, NULL, -1,
+ &ident,
+ devlist, NULL,
+ readonly, runstop, "homehost", homehost, verbose-quiet, force);
+ if (rv2==0) {
+ cnt++;
+ acnt++;
+ }
+ } 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) {
+ fprintf(stderr, Name ": No arrays found in config file or automatically\n");
+ rv = 1;
}
+ } else if (cnt == 0 && rv == 0) {
+ fprintf(stderr, Name ": No arrays found in config file\n");
+ rv = 1;
+ }
}
break;
case BUILD:
exit(2);
}
if (devlist == NULL)
- devlist = conf_get_devs(configfile);
+ devlist = conf_get_devs();
if (devlist == NULL) {
fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
exit(1);
}
- rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss);
+ rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss, homehost);
} else {
if (devlist == NULL) {
if (devmode=='D' && scan) {
e->dev);
continue;
}
- mdfd = open_mddev(name, 0);
+ mdfd = open_mddev(name, 1);
if (mdfd >= 0) {
- if (Manage_runstop(name, mdfd, -1, !last))
+ if (Manage_runstop(name, mdfd, -1, quiet?1:last?0:-1))
err = 1;
else
progress = 1;
case 'X':
rv |= ExamineBitmap(dv->devname, brief, ss); continue;
}
- mdfd = open_mddev(dv->devname, 0);
+ mdfd = open_mddev(dv->devname, 1);
if (mdfd>=0) {
switch(dv->disposition) {
case 'R':
- rv |= Manage_runstop(dv->devname, mdfd, 1, 0); break;
+ rv |= Manage_runstop(dv->devname, mdfd, 1, quiet); break;
case 'S':
- rv |= Manage_runstop(dv->devname, mdfd, -1, 0); break;
+ rv |= Manage_runstop(dv->devname, mdfd, -1, quiet); break;
case 'o':
rv |= Manage_ro(dv->devname, mdfd, 1); break;
case 'w':
}
rv= Monitor(devlist, mailaddr, program,
delay?delay:60, daemonise, scan, oneshot,
- dosyslog, configfile, test, pidfile);
+ dosyslog, test, pidfile);
break;
case GROW:
projects / thirdparty / mdadm.git / blobdiff