don't hardcode the path to criu when checking versions

We use the right path when actually execing criu to checkpoint and restore, but
when checking versions we didn't. Let's use the right path.

Reported-by: Dietmar Maurer <dietmar@proxmox.com>
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index c331adf7f126a6107c735509c2064c97b947925e..c6b1863a9a58826692bc624e817bb5005db0fb49 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -223,13 +223,15 @@ static bool criu_version_ok()
 
        if (pid == 0) {
                char *args[] = { "criu", "--version", NULL };
+               char *path;
                close(pipes[0]);
 
                close(STDERR_FILENO);
                if (dup2(pipes[1], STDOUT_FILENO) < 0)
                        exit(1);
 
-               execv("/usr/local/sbin/criu", args);
+               path = on_path("criu", NULL);
+               execv(path, args);
                exit(1);
        } else {
                FILE *f;