Don't assume that mdmon is in the current directory.

Rather, assume that it is in the same directory from which
mdadm was run.  If not, then maybe /sbin or current directory.

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/util.c b/util.c
index da61a0be60048a2ea7da3aeb6d1a2dc6471f5d48..fe46f3b02d9c20a58079e0f70f8b48d41308d1e5 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1077,19 +1077,42 @@ int signal_mdmon(int devnum)
 int start_mdmon(int devnum)
 {
        int i;
 int start_mdmon(int devnum)
 {
        int i;

+       int len;
+       char pathbuf[1024];
+       char *paths[4] = {
+               pathbuf,
+               "/sbin/mdmon",
+               "mdmon",
+               NULL
+       };

 
        if (env_no_mdmon())
                return 0;
 
 
        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);
        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");
                exit(1);
        case -1: fprintf(stderr, Name ": cannot run mdmon. "
                         "Array remains readonly\n");