From a99d3469713138f050cccb8657c24a05ffa7057e Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 20 Aug 2012 10:37:21 +1000 Subject: [PATCH] mdmon: allow --takeover when original was started with --offroot As --offroot causes ARGV[0] to be changed, we need to be more lenient when checking that the mdmon we are about to kill really is mdmon. i.e. allow name to be "@dmon" instead. Signed-off-by: NeilBrown --- mdmon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mdmon.c b/mdmon.c index d06e475..5d5ae94 100644 --- a/mdmon.c +++ b/mdmon.c @@ -184,7 +184,11 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock) buf[sizeof(buf)-1] = 0; close(fd); - if (n < 0 || !strstr(buf, "mdmon")) + /* Note that if started with --offroot, the name + * might be "@dmon" + */ + if (n < 0 || !(strstr(buf, "mdmon") || + strstr(buf, "@dmon"))) return; kill(pid, SIGTERM);