Set default name for v1 array based on device name.

[thirdparty/mdadm.git] / mdadm.c

diff --git a/mdadm.c b/mdadm.c
index dc3e282a6707038b6ec5447725ac4f5c2f5e11a0..ff656e4122ded98049311f0fff9e4f902e87b27b 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -237,6 +237,7 @@ int main(int argc, char *argv[])
                                        dv->disposition = devmode;
                                        dv->writemostly = writemostly;
                                        dv->re_add = re_add;
+                                       dv->used = 0;
                                        dv->next = NULL;
                                        *devlistend = dv;
                                        devlistend = &dv->next;
@@ -566,6 +567,10 @@ int main(int argc, char *argv[])
                                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");
@@ -868,6 +873,8 @@ int main(int argc, char *argv[])
                        fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n");      
                        exit(2);
                }
+               if (mode == MANAGE && runstop < 0)
+                       autof=1; /* Don't create */
                mdfd = open_mddev(devlist->devname, autof);
                if (mdfd < 0)
                        exit(1);
@@ -939,14 +946,14 @@ int main(int argc, char *argv[])
                                else {
                                        rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile,
                                                       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,
                                      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");
@@ -972,41 +979,76 @@ int main(int argc, char *argv[])
                                }
                                rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile,
                                               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_dev_t devlist = conf_get_devs(configfile);
+                       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, configfile,
+                                                      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, configfile,
+                                                              devlist, NULL,
+                                                              readonly, runstop, NULL, 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(configfile);
+                               } 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:
@@ -1093,7 +1135,7 @@ int main(int argc, char *argv[])
                                                                        e->dev);
                                                                continue;
                                                        }
-                                                       mdfd = open_mddev(name, 0);
+                                                       mdfd = open_mddev(name, 1);
                                                        if (mdfd >= 0) {
                                                                if (Manage_runstop(name, mdfd, -1, !last))
                                                                        err = 1;
@@ -1122,7 +1164,7 @@ int main(int argc, char *argv[])
                                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':