Give error if --incremental --scan also has a device name given.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/mdadm.c b/mdadm.c
index f55a035ca8af4fa29a6fdbd4cc13e7301f63ba23..d3cf0fad87bf94f1910854e397c47bcfba0799ae 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1527,6 +1527,11 @@ int main(int argc, char *argv[])
                        RebuildMap();
                }
                if (c.scan) {
+                       rv = 1;
+                       if (devlist) {
+                               pr_err("In --incremental mode, a device cannot be given with --scan.\n");
+                               break;
+                       }
                        if (c.runstop <= 0) {
                                pr_err("--incremental --scan meaningless without --run.\n");
                                break;