From: NeilBrown <neilb@suse.de>
Date: Sat, 14 Sep 2013 23:14:25 +0000 (+1000)
Subject: Give error if --incremental --scan also has a device name given.
X-Git-Tag: mdadm-3.3.1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eaf410feda4ad112d3cee0c0b5b4edf05fc63bf;p=thirdparty%2Fmdadm.git

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 f55a035c..d3cf0fad 100644
--- 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;