X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mdadm.c;h=5fb1b8de503efb36725dd5acf88cac0790baf090;hb=beae1dfe2e5a3f11e6e52a93fbf617d644708415;hp=c5035b86592e92190658d3a8daf27dd8c6f9f36d;hpb=ab56093f3b0fd59c49a5cdef22c0480e589f0989;p=thirdparty%2Fmdadm.git diff --git a/mdadm.c b/mdadm.c index c5035b86..5fb1b8de 100644 --- a/mdadm.c +++ b/mdadm.c @@ -75,6 +75,7 @@ int main(int argc, char *argv[]) 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 @@ -200,6 +201,7 @@ int main(int argc, char *argv[]) case 'S': case 'o': case 'w': + case 'W': case 'K': if (!mode) newmode = MISC; break; } if (mode && newmode == mode) { @@ -499,6 +501,12 @@ int main(int argc, char *argv[]) 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 */ @@ -575,6 +583,8 @@ int main(int argc, char *argv[]) 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"); @@ -589,7 +599,13 @@ int main(int argc, char *argv[]) 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 */ @@ -605,6 +621,7 @@ int main(int argc, char *argv[]) exit(2); } configfile = optarg; + set_conffile(configfile); /* FIXME possibly check that config file exists. Even parse it */ continue; case O(ASSEMBLE,'s'): /* scan */ @@ -726,6 +743,7 @@ int main(int argc, char *argv[]) case O(MISC,'X'): case O(MISC,'o'): case O(MISC,'w'): + case O(MISC,'W'): if (devmode && devmode != opt && (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) { fprintf(stderr, Name ": --examine/-E cannot be given with -%c\n", @@ -857,6 +875,19 @@ int main(int argc, char *argv[]) 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 @@ -911,7 +942,7 @@ int main(int argc, char *argv[]) } if (homehost == NULL) - homehost = conf_get_homehost(configfile); + homehost = conf_get_homehost(); if (homehost && strcmp(homehost, "")==0) { if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) { sys_hostname[sizeof(sys_hostname)-1] = 0; @@ -937,7 +968,7 @@ int main(int argc, char *argv[]) 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); @@ -948,14 +979,14 @@ int main(int argc, char *argv[]) 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) { @@ -968,7 +999,7 @@ int main(int argc, char *argv[]) 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); @@ -981,14 +1012,14 @@ int main(int argc, char *argv[]) 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"); @@ -1012,11 +1043,11 @@ int main(int argc, char *argv[]) } 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++; } @@ -1034,8 +1065,8 @@ int main(int argc, char *argv[]) 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++; @@ -1048,7 +1079,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(configfile); } while (acnt); if (cnt == 0 && auto_update_home && homehost) { /* Nothing found, maybe we need to bootstrap homehost info */ @@ -1056,8 +1086,8 @@ int main(int argc, char *argv[]) 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++; @@ -1065,7 +1095,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(configfile); } while (acnt); } if (cnt == 0 && rv == 0) { @@ -1111,18 +1140,19 @@ int main(int argc, char *argv[]) bitmap_file, bitmap_chunk, write_behind, delay); break; case MISC: - if (devmode == 'E') { if (devlist == NULL && !scan) { fprintf(stderr, Name ": No devices to examine\n"); 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) { @@ -1190,6 +1220,8 @@ int main(int argc, char *argv[]) rv |= Query(dv->devname); continue; case 'X': rv |= ExamineBitmap(dv->devname, brief, ss); continue; + case 'W': + rv |= Wait(dv->devname); continue; } mdfd = open_mddev(dv->devname, 1); if (mdfd>=0) { @@ -1222,7 +1254,7 @@ int main(int argc, char *argv[]) } rv= Monitor(devlist, mailaddr, program, delay?delay:60, daemonise, scan, oneshot, - dosyslog, configfile, test, pidfile); + dosyslog, test, pidfile); break; case GROW: