int force = 0;
int test = 0;
int assume_clean = 0;
+ char *symlinks = NULL;
/* autof indicates whether and how to create device node.
* bottom 3 bits are style. Rest (when shifted) are number of parts
* 0 - unset
autof = parse_auto(optarg, "--auto flag", 0);
continue;
+ case O(CREATE,Symlinks):
+ case O(BUILD,Symlinks):
+ case O(ASSEMBLE,Symlinks): /* auto creation of symlinks in /dev to /dev/md */
+ symlinks = optarg;
+ continue;
+
case O(BUILD,'f'): /* force honouring '-n 1' */
case O(GROW,'f'): /* ditto */
case O(CREATE,'f'): /* force honouring of device list */
continue;
if (strcmp(update, "homehost")==0)
continue;
+ if (strcmp(update, "devicesize")==0)
+ continue;
if (strcmp(update, "byteorder")==0) {
if (ss) {
fprintf(stderr, Name ": must not set metadata type with --update=byteorder.\n");
continue;
}
- fprintf(stderr, Name ": '--update %s' invalid. Only 'sparc2.2', 'super-minor', 'uuid', 'resync' or 'summaries' supported\n",update);
+ if (strcmp(update,"?") == 0 || strcmp(update, "help") == 0)
+ fprintf(stderr, Name ": ");
+ else
+ fprintf(stderr, Name ": '--update=%s' is invalid. ", update);
+ fprintf(stderr, "Valid --update options are:\n"
+ " 'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n"
+ " 'summaries', 'homehost', 'byteorder', 'devicesize'.\n");
exit(2);
case O(ASSEMBLE,NoDegraded): /* --no-degraded */
exit(2);
}
configfile = optarg;
+ set_conffile(configfile);
/* FIXME possibly check that config file exists. Even parse it */
continue;
case O(ASSEMBLE,'s'): /* scan */
fputs(Usage, stderr);
exit(2);
}
+
+ if (symlinks) {
+ struct createinfo *ci = conf_get_create_info();
+
+ if (strcasecmp(symlinks, "yes") == 0)
+ ci->symlinks = 1;
+ else if (strcasecmp(symlinks, "no") == 0)
+ ci->symlinks = 0;
+ else {
+ fprintf(stderr, Name ": option --symlinks must be 'no' or 'yes'\n");
+ exit(2);
+ }
+ }
/* Ok, got the option parsing out of the way
* hopefully it's mostly right but there might be some stuff
* missing
fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");
exit(2);
}
- if (mode == MANAGE && runstop < 0)
+ if (mode == MANAGE || mode == GROW)
autof=1; /* Don't create */
mdfd = open_mddev(devlist->devname, autof);
if (mdfd < 0)
}
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, 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, homehost, verbose-quiet, force);
else if (devs_found>0) {
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, homehost, verbose-quiet, force);
close(mdfd);
}
} else {
- mddev_ident_t array_list = conf_get_ident(configfile, NULL);
- mddev_dev_t devlist = conf_get_devs(configfile);
+ 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");
}
if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
/* already assembled, skip */
- ;
+ cnt++;
else {
rv |= Assemble(ss, array_list->devname, mdfd,
- array_list, configfile,
- devlist, NULL,
+ array_list,
+ NULL, NULL,
readonly, runstop, NULL, homehost, verbose-quiet, force);
if (rv == 0) cnt++;
}
acnt = 0;
do {
rv2 = Assemble(ss, NULL, -1,
- &ident, configfile,
- devlist, NULL,
+ &ident,
+ NULL, NULL,
readonly, runstop, NULL, homehost, verbose-quiet, force);
if (rv2==0) {
cnt++;
auto_update_home = 0;
} while (rv2!=2);
/* Incase there are stacked devices, we need to go around again */
- devlist = conf_get_devs(configfile);
} while (acnt);
if (cnt == 0 && auto_update_home && homehost) {
/* Nothing found, maybe we need to bootstrap homehost info */
acnt = 0;
do {
rv2 = Assemble(ss, NULL, -1,
- &ident, configfile,
- devlist, NULL,
+ &ident,
+ NULL, NULL,
readonly, runstop, "homehost", homehost, verbose-quiet, force);
if (rv2==0) {
cnt++;
}
} while (rv2!=2);
/* Incase there are stacked devices, we need to go around again */
- devlist = conf_get_devs(configfile);
} while (acnt);
}
if (cnt == 0 && rv == 0) {
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);
}
+ if (brief && verbose)
+ brief = 2;
rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss, homehost);
} else {
if (devlist == NULL) {
}
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;
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