mdmon: fork and run as a daemon.

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index da61a0be60048a2ea7da3aeb6d1a2dc6471f5d48..3bf4cbe31d832eb124f5bf37315ec67f70ce912c 100644 (file)
--- a/util.c
+++ b/util.c
@@ -31,6 +31,7 @@
 #include       "md_p.h"
 #include       <sys/socket.h>
 #include       <sys/utsname.h>
+#include       <sys/wait.h>
 #include       <sys/un.h>
 #include       <ctype.h>
 #include       <dirent.h>
@@ -1077,24 +1078,52 @@ int signal_mdmon(int devnum)
 int start_mdmon(int devnum)
 {
        int i;
+       int len;
+       pid_t pid;      
+       int status;
+       char pathbuf[1024];
+       char *paths[4] = {
+               pathbuf,
+               "/sbin/mdmon",
+               "mdmon",
+               NULL
+       };
 
        if (env_no_mdmon())
                return 0;
 
+       len = readlink("/proc/self/exe", pathbuf, sizeof(pathbuf));
+       if (len > 0) {
+               char *sl;
+               pathbuf[len] = 0;
+               sl = strrchr(pathbuf, '/');
+               if (sl)
+                       sl++;
+               else
+                       sl = pathbuf;
+               strcpy(sl, "mdmon");
+       } else
+               pathbuf[0] = '\0';
+
        switch(fork()) {
        case 0:
                /* FIXME yuk. CLOSE_EXEC?? */
                for (i=3; i < 100; i++)
                        close(i);
-               execl("./mdmon", "mdmon",
-                     map_dev(dev2major(devnum),
-                             dev2minor(devnum),
-                             1), NULL);
+               for (i=0; paths[i]; i++)
+                       if (paths[i][0])
+                               execl(paths[i], "mdmon",
+                                     map_dev(dev2major(devnum),
+                                             dev2minor(devnum),
+                                             1), NULL);
                exit(1);
        case -1: fprintf(stderr, Name ": cannot run mdmon. "
                         "Array remains readonly\n");
                return -1;
-       default: ; /* parent - good */
+       default: /* parent - good */
+               pid = wait(&status);
+               if (pid < 0 || status != 0)
+                       return -1;
        }
        return 0;
 }