]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
Fix parsing of "-a" in various contexts.
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index 9fe56abe6c084a76c5b3d7660a8590933ae9b855..e96ce68aa41e2980a1b0a161cd9ab04063c76b77 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -74,7 +74,9 @@ int main(int argc, char *argv[])
        int brief = 0;
        int force = 0;
        int test = 0;
+       int export = 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
@@ -100,10 +102,12 @@ int main(int argc, char *argv[])
        int re_add = 0;
        char *shortopt = short_options;
        int dosyslog = 0;
+       int rebuild_map = 0;
        int auto_update_home = 0;
 
        int copies;
        int print_help = 0;
+       FILE *outf;
 
        int mdfd = -1;
 
@@ -156,6 +160,9 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case 'Y': export++;
+                       continue;
+
                case HomeHost:
                        homehost = optarg;
                        continue;
@@ -173,7 +180,7 @@ int main(int argc, char *argv[])
                switch(opt) {
                case '@': /* just incase they say --manage */
                        newmode = MANAGE;
-                       shortopt = short_bitmap_auto_options;
+                       shortopt = short_bitmap_options;
                        break;
                case 'a':
                case 'r':
@@ -181,7 +188,7 @@ int main(int argc, char *argv[])
                case ReAdd: /* re-add */
                        if (!mode) {
                                newmode = MANAGE;
-                               shortopt = short_bitmap_auto_options;
+                               shortopt = short_bitmap_options;
                        }
                        break;
 
@@ -189,7 +196,12 @@ int main(int argc, char *argv[])
                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 'G': newmode = GROW;
+                       shortopt = short_bitmap_options;
+                       break;
+               case 'I': newmode = INCREMENTAL; break;
+               case AutoDetect:
+                       newmode = AUTODETECT; break;
 
                case '#':
                case 'D':
@@ -200,6 +212,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) {
@@ -222,7 +235,7 @@ int main(int argc, char *argv[])
                        if (opt == 'c' && 
                            ( strncmp(optarg, "--h", 3)==0 ||
                              strncmp(optarg, "-h", 2)==0)) {
-                               fputs(Help_config, stderr);
+                               fputs(Help_config, stdout);
                                exit(0);
                        }
 
@@ -267,6 +280,8 @@ int main(int argc, char *argv[])
                case 'C':
                case 'F':
                case 'G':
+               case 'I':
+               case AutoDetect:
                        continue;
                }
                if (opt == 1) {
@@ -319,6 +334,7 @@ int main(int argc, char *argv[])
                case O(ASSEMBLE,AutoHomeHost):
                        auto_update_home = 1;
                        continue;
+               case O(INCREMENTAL, 'e'):
                case O(CREATE,'e'):
                case O(ASSEMBLE,'e'):
                case O(MISC,'e'): /* set metadata (superblock) information */
@@ -499,6 +515,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 */
@@ -508,6 +530,7 @@ int main(int argc, char *argv[])
                        continue;
 
                        /* now for the Assemble options */
+               case O(CREATE,'u'): /* uuid of array */
                case O(ASSEMBLE,'u'): /* uuid of array */
                        if (ident.uuid_set) {
                                fprintf(stderr, Name ": uuid cannot be set twice.  "
@@ -575,6 +598,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,11 +614,24 @@ 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);
-                       exit(2);
+                       if (strcmp(update,"?") == 0 ||
+                           strcmp(update, "help") == 0) {
+                               outf = stdout;
+                               fprintf(outf, Name ": ");
+                       } else {
+                               outf = stderr;
+                               fprintf(outf,
+                                       Name ": '--update=%s' is invalid.  ",
+                                       update);
+                       }
+                       fprintf(outf, "Valid --update options are:\n"
+               "     'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n"
+               "     'summaries', 'homehost', 'byteorder', 'devicesize'.\n");
+                       exit(outf == stdout ? 0 : 2);
 
                case O(ASSEMBLE,NoDegraded): /* --no-degraded */
-                       runstop = -1; /* --stop isn't allowed for --assemble, so we overload slightly */
+                       runstop = -1; /* --stop isn't allowed for --assemble,
+                                      * so we overload slightly */
                        continue;
 
                case O(ASSEMBLE,'c'): /* config file */
@@ -611,6 +649,7 @@ int main(int argc, char *argv[])
                case O(ASSEMBLE,'s'): /* scan */
                case O(MISC,'s'):
                case O(MONITOR,'s'):
+               case O(INCREMENTAL,'s'):
                        scan = 1;
                        continue;
 
@@ -685,6 +724,7 @@ int main(int argc, char *argv[])
                case O(MANAGE,'f'): /* set faulty */
                        devmode = 'f';
                        continue;
+               case O(INCREMENTAL,'R'):
                case O(MANAGE,'R'):
                case O(ASSEMBLE,'R'):
                case O(BUILD,'R'):
@@ -727,6 +767,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",
@@ -815,6 +856,10 @@ int main(int argc, char *argv[])
                                }
                        }
                        continue;
+
+               case O(INCREMENTAL, 'r'):
+                       rebuild_map = 1;
+                       continue;
                }
                /* We have now processed all the valid options. Anything else is
                 * an error
@@ -843,8 +888,9 @@ int main(int argc, char *argv[])
                        case MISC     : help_text = Help_misc; break;
                        case MONITOR  : help_text = Help_monitor; break;
                        case GROW     : help_text = Help_grow; break;
+                       case INCREMENTAL:help_text= Help_incr; break;
                        }
-               fputs(help_text,stderr);
+               fputs(help_text,stdout);
                exit(0);
        }
 
@@ -858,6 +904,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
@@ -1013,7 +1072,7 @@ 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,
@@ -1084,6 +1143,11 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
+               if (raiddisks == 0) {
+                       fprintf(stderr, Name ": no raid-disks specified.\n");
+                       rv = 1;
+                       break;
+               }
 
                if (bitmap_file) {
                        if (strcmp(bitmap_file, "internal")==0) {
@@ -1103,14 +1167,19 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
+               if (raiddisks == 0) {
+                       fprintf(stderr, Name ": no raid-disks specified.\n");
+                       rv = 1;
+                       break;
+               }
 
                rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
                            raiddisks, sparedisks, ident.name, homehost,
+                           ident.uuid_set ? ident.uuid : NULL,
                            devs_found-1, devlist->next, runstop, verbose-quiet, force, assume_clean,
                            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");
@@ -1122,6 +1191,8 @@ int main(int argc, char *argv[])
                                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) {
@@ -1137,7 +1208,8 @@ int main(int argc, char *argv[])
                                                                e->dev);
                                                        continue;
                                                }
-                                               rv |= Detail(name, verbose>1?0:verbose+1, test, homehost);
+                                               rv |= Detail(name, verbose>1?0:verbose+1,
+                                                            export, test, homehost);
                                                put_md_name(name);
                                        }
                                } else  if (devmode == 'S' && scan) {
@@ -1182,13 +1254,18 @@ int main(int argc, char *argv[])
                        for (dv=devlist ; dv; dv=dv->next) {
                                switch(dv->disposition) {
                                case 'D':
-                                       rv |= Detail(dv->devname, brief?1+verbose:0, test, homehost); continue;
+                                       rv |= Detail(dv->devname,
+                                                    brief?1+verbose:0,
+                                                    export, test, homehost);
+                                       continue;
                                case 'K': /* Zero superblock */
                                        rv |= Kill(dv->devname, force, quiet); continue;
                                case 'Q':
                                        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) {
@@ -1254,6 +1331,38 @@ int main(int argc, char *argv[])
                } else
                        fprintf(stderr, Name ": no changes to --grow\n");
                break;
+       case INCREMENTAL:
+               if (rebuild_map) {
+                       RebuildMap();
+               }
+               if (scan) {
+                       if (runstop <= 0) {
+                               fprintf(stderr, Name
+                        ": --incremental --scan meaningless without --run.\n");
+                               break;
+                       }
+                       rv = IncrementalScan(verbose);
+               }
+               if (!devlist) {
+                       if (!rebuild_map && !scan) {
+                               fprintf(stderr, Name
+                                       ": --incremental requires a device.\n");
+                               rv = 1;
+                       }
+                       break;
+               }
+               if (devlist->next) {
+                       fprintf(stderr, Name
+                              ": --incremental can only handle one device.\n");
+                       rv = 1;
+                       break;
+               }
+               rv = Incremental(devlist->devname, verbose-quiet, runstop,
+                                ss, homehost, autof);
+               break;
+       case AUTODETECT:
+               autodetect();
+               break;
        }
        exit(rv);
 }