* Sydney, 2052
* Australia
*
- * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004,
+ * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004,
* Paul Clements, SteelEye Technology, Inc.
*/
/* firstly, some mode-independant options */
switch(opt) {
case 'h':
- if (option_index > 0 &&
+ if (option_index > 0 &&
strcmp(long_options[option_index].name, "help-options")==0)
print_help = 2;
else
}
/* second, figure out the mode.
* Some options force the mode. Others
- * set the mode if it isn't already
+ * set the mode if it isn't already
*/
switch(opt) {
case '@': /* just incase they say --manage */
newmode = MANAGE;
- shortopt = short_bitmap_auto_options;
+ shortopt = short_bitmap_options;
break;
case 'a':
case 'r':
case ReAdd: /* re-add */
if (!mode) {
newmode = MANAGE;
- shortopt = short_bitmap_auto_options;
+ shortopt = short_bitmap_options;
}
break;
case 'B': newmode = BUILD; shortopt = short_bitmap_auto_options; break;
case 'C': newmode = CREATE; shortopt = short_bitmap_auto_options; break;
case 'F': newmode = MONITOR;break;
- case 'G': newmode = GROW; shortopt = short_bitmap_auto_options; break;
- case 'I': newmode = INCREMENTAL; break;
+ case 'G': newmode = GROW;
+ shortopt = short_bitmap_options;
+ break;
+ case 'I': newmode = INCREMENTAL;
+ shortopt = short_bitmap_auto_options; break;
case AutoDetect:
newmode = AUTODETECT; break;
mode = newmode;
} else {
/* special case of -c --help */
- if (opt == 'c' &&
+ if (opt == 'c' &&
( strncmp(optarg, "--h", 3)==0 ||
strncmp(optarg, "-h", 2)==0)) {
fputs(Help_config, stdout);
dv->next = NULL;
*devlistend = dv;
devlistend = &dv->next;
-
+
devs_found++;
continue;
}
dv->next = NULL;
*devlistend = dv;
devlistend = &dv->next;
-
+
devs_found++;
continue;
}
fprintf(stderr, Name ": metadata information already given\n");
exit(2);
}
- for(i=0; !ss && superlist[i]; i++)
+ for(i=0; !ss && superlist[i]; i++)
ss = superlist[i]->match_metadata_desc(optarg);
if (!ss) {
case -5: /* Faulty
* modeNNN
*/
-
+
{
int ln = strcspn(optarg, "0123456789");
char *m = strdup(optarg);
case O(CREATE,'a'):
case O(BUILD,'a'):
+ case O(INCREMENTAL,'a'):
case O(ASSEMBLE,'a'): /* auto-creation of device node */
autof = parse_auto(optarg, "--auto flag", 0);
continue;
exit(2);
}
update = optarg;
- if (strcmp(update, "sparc2.2")==0)
+ if (strcmp(update, "sparc2.2")==0)
continue;
if (strcmp(update, "super-minor") == 0)
continue;
fprintf(stderr, Name ": must not set metadata type with --update=byteorder.\n");
exit(2);
}
- for(i=0; !ss && superlist[i]; i++)
+ for(i=0; !ss && superlist[i]; i++)
ss = superlist[i]->match_metadata_desc("0.swap");
if (!ss) {
fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n");
test = 1;
continue;
case O(MONITOR,'y'): /* log messages to syslog */
- openlog("mdadm", 0, SYSLOG_FACILITY);
+ openlog("mdadm", LOG_PID, SYSLOG_FACILITY);
dosyslog = 1;
continue;
backup_file = optarg;
continue;
- case O(GROW,'b'):
case O(BUILD,'b'):
case O(CREATE,'b'): /* here we create the bitmap */
+ if (strcmp(optarg, "none") == 0) {
+ fprintf(stderr, Name ": '--bitmap none' only"
+ " support for --grow\n");
+ exit(2);
+ }
+ /* FALL THROUGH */
+ case O(GROW,'b'):
if (strcmp(optarg, "internal")== 0 ||
strcmp(optarg, "none")== 0 ||
strchr(optarg, '/') != NULL) {
bitmap_chunk = bitmap_chunk ? bitmap_chunk * 1024 : 512;
continue;
+ case O(GROW, WriteBehind):
case O(BUILD, WriteBehind):
case O(CREATE, WriteBehind): /* write-behind mode */
write_behind = DEFAULT_MAX_WRITE_BEHIND;
exit(2);
}
if ((int)ident.super_minor == -2 && autof) {
- fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");
+ fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");
exit(2);
}
if (mode == MANAGE || mode == GROW)
devlist->devname);
rv |= 1;
} else {
- mdfd = open_mddev(devlist->devname,
+ mdfd = open_mddev(devlist->devname,
array_ident->autof ? array_ident->autof : autof);
if (mdfd < 0)
rv |= 1;
rv |= 1;
continue;
}
- mdfd = open_mddev(dv->devname,
+ mdfd = open_mddev(dv->devname,
array_ident->autof ?array_ident->autof : autof);
if (mdfd < 0) {
rv |= 1;
int acnt;
ident.autof = autof;
do {
+ mddev_dev_t devlist = conf_get_devs();
acnt = 0;
do {
rv2 = Assemble(ss, NULL, -1,
&ident,
- NULL, NULL,
+ devlist, NULL,
readonly, runstop, NULL, homehost, verbose-quiet, force);
if (rv2==0) {
cnt++;
if (cnt == 0 && rv == 0) {
fprintf(stderr, Name ": No arrays found in config file or automatically\n");
rv = 1;
- }
+ } else if (cnt)
+ rv = 0;
} else if (cnt == 0 && rv == 0) {
fprintf(stderr, Name ": No arrays found in config file\n");
rv = 1;
}
if (brief && verbose)
brief = 2;
- rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss, homehost);
+ rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief,
+ export, scan,
+ SparcAdjust, ss, homehost);
} else {
if (devlist == NULL) {
if (devmode=='D' && scan) {
put_md_name(name);
}
+ /* This is a bit of a hack.
+ * When we stop an array in a container, it
+ * takes a moment for mdmon to let go.
+ * So just pause briefly incase that is
+ * happening. Maybe we should do something
+ * more deterministic via the socket.
+ */
+ if (progress && err)
+ usleep(50000);
+
} while (!last && err);
if (err) rv |= 1;
} else {
export, test, homehost);
continue;
case 'K': /* Zero superblock */
- rv |= Kill(dv->devname, force, quiet); continue;
+ rv |= Kill(dv->devname, force, quiet,0);
+ continue;
case 'Q':
rv |= Query(dv->devname); continue;
case 'X':
case GROW:
if (devs_found > 1) {
-
+
/* must be '-a'. */
if (size >= 0 || raiddisks) {
fprintf(stderr, Name ": --size, --raiddisks, and --add are exclusing in --grow mode\n");