From: NeilBrown <neilb@suse.de>
Date: Mon, 19 Sep 2011 01:01:19 +0000 (+1000)
Subject: Monitor: --oneshot must imply --no-sharing
X-Git-Tag: mdadm-3.2.3~164
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=3f555346fb26b7ee7447b004ecb2c2d57f243867

Monitor: --oneshot must imply --no-sharing

Moving spares is not the purpose of '--oneshot' and without
currently --oneshot doesn't work as the check against multiple
spare-sharers prevents it.

So make --oneshot imply --no-sharing.  This is sensible and allows
--oneshot to work again.

Reported-by: Jamie Heilman <jamie@audible.transient.net>
Resolves-Debian-Bug: 641886
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/mdadm.c b/mdadm.c
index 4b817ab9..15335101 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -841,6 +841,7 @@ int main(int argc, char *argv[])
 			continue;
 		case O(MONITOR,'1'): /* oneshot */
 			oneshot = 1;
+			spare_sharing = 0;
 			continue;
 		case O(MONITOR,'t'): /* test */
 			test = 1;