]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Grow: Do not fork via systemd if freeze_reshape is set
authorBaldysiak, Pawel <pawel.baldysiak@intel.com>
Fri, 30 May 2014 14:40:11 +0000 (14:40 +0000)
committerNeilBrown <neilb@suse.de>
Mon, 2 Jun 2014 02:42:01 +0000 (12:42 +1000)
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>
Grow.c

diff --git a/Grow.c b/Grow.c
index 2de821d0b9d432b8b6945ed417f91d1f6e188a0a..03b77f533ebbf32fa851d45c1333e64a1ebcca9b 100644 (file)
--- 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;