Remove --offroot argument and default to always setting argv[0] to @

We still allow --offroot to be given - for compatibility with scripts
- but ignore it.

The whole point of --offroot is to get systemd to not auto-kill mdmon,
and we always want that.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 8 insertions, 7 deletions

diff --git a/mdadm.c b/mdadm.c
index 26e8ceca..f22fd7ba 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -116,6 +116,13 @@ 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,
@@ -159,14 +166,8 @@ int main(int argc, char *argv[])
 				c.homehost = optarg;
 			continue;
 
-		/*
-		 * --offroot sets 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
-		 */
 		case OffRootOpt:
-			argv[0][0] = '@';
-			__offroot = 1;
+			/* Silently ignore old option */
 			continue;
 
 		case Prefer: