]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Don't lie to systemd about mdadm's status.
authorNeilBrown <neilb@suse.de>
Thu, 1 Aug 2013 04:04:07 +0000 (14:04 +1000)
committerNeilBrown <neilb@suse.de>
Thu, 1 Aug 2013 04:04:07 +0000 (14:04 +1000)
Telling systemd that mdadm was started from the initrd
is often a lie and never necessary.  Now that the reshape monitoring
thread handles SIGTERM gracefully it is OK for system to kill
and mdadm that it finds running.

mdmon still have a bit of a question mark over it so I won't remove
the '@' from there just yet.

Signed-off-by: NeilBrown <neilb@suse.de>
mdadm.c

diff --git a/mdadm.c b/mdadm.c
index a46a716b29617014aeb6aab83698ce465467f3e5..86a4fad210b1725c6b49e73838516359d75491f1 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -116,13 +116,6 @@ int main(int argc, char *argv[])
        ident.container = NULL;
        ident.member = NULL;
 
-       /*
-        * set first char of argv[0] to @. This is used by
-        * systemd to signal that the task was launched from
-        * initrd/initramfs and should be preserved during shutdown
-        */
-       argv[0][0] = '@';
-
        while ((option_index = -1) ,
               (opt=getopt_long(argc, argv,
                                shortopt, long_options,