Remove avail_disks arg from 'enough'.

[thirdparty/mdadm.git] / mdadm.c

diff --git a/mdadm.c b/mdadm.c
index ebf1c46eab78204fbd8a626cc43b3d1cf97d5e56..1efa3e80a2eb40292f9379eb0270b17bc1584f4d 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -174,6 +174,16 @@ int main(int argc, char *argv[])
                                homehost = optarg;
                        continue;
 
+               /*
+                * --offroot sets first char of argv[0] to @. This is used
+                * by systemd to signal that the tast was launched from
+                * initrd/initramfs and should be preserved during shutdown
+                */
+               case OffRootOpt:
+                       argv[0][0] = '@';
+                       __offroot = 1;
+                       continue;
+
                case ':':
                case '?':
                        fputs(Usage, stderr);
@@ -212,13 +222,17 @@ int main(int argc, char *argv[])
                case 'I': newmode = INCREMENTAL;
                        shortopt = short_bitmap_auto_options; break;
                case AutoDetect:
-                       newmode = AUTODETECT; break;
+                       newmode = AUTODETECT;
+                       break;
 
                case MiscOpt:
                case 'D':
                case 'E':
                case 'X':
-               case 'Q': newmode = MISC; break;
+               case 'Q':
+                       newmode = MISC;
+                       break;
+
                case 'R':
                case 'S':
                case 'o':
@@ -229,17 +243,15 @@ int main(int argc, char *argv[])
                case DetailPlatform:
                case KillSubarray:
                case UpdateSubarray:
-                       if (opt == KillSubarray || opt == UpdateSubarray) {
-                               if (subarray) {
-                                       fprintf(stderr, Name ": subarray can only"
-                                               " be specified once\n");
-                                       exit(2);
-                               }
-                               subarray = optarg;
-                       }
                case UdevRules:
-               case 'K': if (!mode) newmode = MISC; break;
-               case NoSharing: newmode = MONITOR; break;
+               case 'K':
+                       if (!mode)
+                               newmode = MISC;
+                       break;
+
+               case NoSharing:
+                       newmode = MONITOR;
+                       break;
                }
                if (mode && newmode == mode) {
                        /* everybody happy ! */
@@ -924,6 +936,14 @@ int main(int argc, char *argv[])
                case O(MISC, DetailPlatform):
                case O(MISC, KillSubarray):
                case O(MISC, UpdateSubarray):
+                       if (opt == KillSubarray || opt == UpdateSubarray) {
+                               if (subarray) {
+                                       fprintf(stderr, Name ": subarray can only"
+                                               " be specified once\n");
+                                       exit(2);
+                               }
+                               subarray = optarg;
+                       }
                        if (devmode && devmode != opt &&
                            (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) {
                                fprintf(stderr, Name ": --examine/-E cannot be given with ");
@@ -1199,7 +1219,8 @@ int main(int argc, char *argv[])
                require_homehost = 0;
        }
 
-       if ((mode != MISC || devmode != 'E') &&
+       if (!((mode == MISC && devmode == 'E')
+             || (mode == MONITOR && spare_sharing == 0)) &&
            geteuid() != 0) {
                fprintf(stderr, Name ": must be super-user to perform this action\n");
                exit(1);
@@ -1279,8 +1300,16 @@ int main(int argc, char *argv[])
                } else {
                        struct mddev_ident *a, *array_list =  conf_get_ident(NULL);
                        struct mddev_dev *devlist = conf_get_devs();
+                       struct map_ent *map = NULL;
                        int cnt = 0;
                        int failures, successes;
+
+                       if (conf_verify_devnames(array_list)) {
+                               fprintf(stderr, Name
+                                       ": Duplicate MD device names in "
+                                       "conf file were found.\n");
+                               exit(1);
+                       }
                        if (devlist == NULL) {
                                fprintf(stderr, Name ": No devices listed in conf file were found.\n");
                                exit(1);
@@ -1298,6 +1327,10 @@ int main(int argc, char *argv[])
                                if (a->autof == 0)
                                        a->autof = autof;
                        }
+                       if (map_lock(&map))
+                               fprintf(stderr, Name " %s: failed to get "
+                                       "exclusive lock on mapfile\n",
+                                       __func__);
                        do {
                                failures = 0;
                                successes = 0;
@@ -1364,6 +1397,7 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": No arrays found in config file\n");
                                rv = 1;
                        }
+                       map_unlock(&map);
                }
                break;
        case BUILD: