MEDIUM: haproxy-systemd-wrapper: Use haproxy in same directory

Locate the wrapper and use a haproxy executable found in the
same directory.

This patch lets the wrapper work in openSUSE.

diff --git a/src/haproxy-systemd-wrapper.c b/src/haproxy-systemd-wrapper.c
index fb1a7fd9272464a657242b523331b8ed1ca5dee6..6546616b79ee711386bf5a731d6eb9b2fdf24dad 100644 (file)
--- a/src/haproxy-systemd-wrapper.c
+++ b/src/haproxy-systemd-wrapper.c
@@ -22,15 +22,30 @@ static char *pid_file = "/run/haproxy.pid";
 static int main_argc;
 static char **main_argv;
 
+static void locate_haproxy(char *buffer, size_t buffer_size)
+{
+       char* end;
+       readlink("/proc/self/exe", buffer, buffer_size);
+       end = strrchr(buffer, '/');
+       if (end == NULL)
+               strncpy(buffer, "/usr/sbin/haproxy", buffer_size);
+       end[1] = '\0';
+       strncat(buffer, "haproxy", buffer_size);
+}
+
 static void spawn_haproxy(char **pid_strv, int nb_pid)
 {
-       pid_t pid = fork();
+       char haproxy_bin[512];
+       pid_t pid;
+
+       pid = fork();
        if (!pid) {
                /* 3 for "haproxy -Ds -sf" */
                char **argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *));
                int i;
                int argno = 0;
-               argv[argno++] = SBINDIR"/haproxy";
+               locate_haproxy(haproxy_bin, 512);
+               argv[argno++] = haproxy_bin;
                for (i = 0; i < main_argc; ++i)
                        argv[argno++] = main_argv[i];
                argv[argno++] = "-Ds";