summaryrefslogtreecommitdiffstats
path: root/mdadm.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2013-09-15 01:14:25 +0200
committerNeilBrown <neilb@suse.de>2013-09-15 01:14:25 +0200
commit9eaf410feda4ad112d3cee0c0b5b4edf05fc63bf (patch)
treebe97057a4d8f7397af96383fdc20d602b18f89f9 /mdadm.c
parentMake -IRs and --run work properly for containers. (diff)
downloadmdadm-9eaf410feda4ad112d3cee0c0b5b4edf05fc63bf.tar.xz
mdadm-9eaf410feda4ad112d3cee0c0b5b4edf05fc63bf.zip
Give error if --incremental --scan also has a device name given.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'mdadm.c')
-rw-r--r--mdadm.c5
1 files changed, 5 insertions, 0 deletions
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;