From: Baldysiak, Pawel <pawel.baldysiak@intel.com>
Date: Fri, 30 May 2014 14:40:11 +0000 (+0000)
Subject: Grow: Do not fork via systemd if freeze_reshape is set
X-Git-Tag: mdadm-3.3.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40b941b813e22b33ff9c70831415f5b65e0fd70b;p=thirdparty%2Fmdadm.git

Grow: Do not fork via systemd if freeze_reshape is set

Mdadm should not run 'grow-continue' unit file for container if
'--freeze-reshape' argument is passed. Otherwise it will be ignored,
and reshape will start anyway.

Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
Reviewed-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Grow.c b/Grow.c
index 2de821d0..03b77f53 100644
--- a/Grow.c
+++ b/Grow.c
@@ -3471,7 +3471,7 @@ int reshape_container(char *container, char *devname,
 	 */
 	ping_monitor(container);
 
-	if (!forked && !check_env("MDADM_NO_SYSTEMCTL"))
+	if (!forked && !freeze_reshape && !check_env("MDADM_NO_SYSTEMCTL"))
 		if (continue_via_systemd(container))
 			return 0;