From 755fa45300ba1dc5da63a1b88cec3e205172f078 Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Wed, 3 Jun 2015 00:13:23 -0600
Subject: [PATCH] don't hardcode the path to criu when checking versions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 src/lxc/criu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index c331adf7f..c6b1863a9 100644
--- 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;
-- 
2.39.5