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>

don't hardcode the path to criu when checking versions
755fa453 · Tycho Andersen · Stéphane Graber · a0411275 · 755fa453
Commit 755fa453 authored Jun 03, 2015 by Tycho Andersen Committed by Stéphane Graber Jun 03, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

criu.c src/lxc/criu.c +3 -1

No files found.
--- 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;