Commit Graph

57 Commits

Author SHA1 Message Date
Serge Hallyn
d9b32b0900 coverity: don't risk exec()ing NULL
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-06-08 10:37:55 -05:00
Tycho Andersen
755fa45300 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>
2015-06-03 10:37:30 -04:00
Tycho Andersen
59c2d40689 c/r: remember to clean up pidfile
When restoring, we didn't clean up the pidfile that criu uses to pass us the
init pid on error or success; let's do that.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-06-02 19:04:23 -04:00
Tycho Andersen
4eae405138 c/r: complain when criu isn't exec()'d correctly
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-05-26 11:16:29 -04:00
Tycho Andersen
dd62857af3 c/r: enable hugetlbfs in criu
In vivid containers hugetlbfs is mounted, but it is not one of the hardcoded
fses in criu, so we need to tell criu that it is okay to automount it.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-04-22 12:30:29 -04:00
Tycho Andersen
8ba5ced736 c/r: check version of criu
Note that we allow both a tagged version or a git build that has sufficient
patches for the features we require.

v2: close criu's stderr too

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-04-22 12:29:51 -04:00
Tycho Andersen
e29fe1dd21 c/r: move criu code to its own file
Trying to cage the beast that is lxccontainer.c.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-04-22 12:29:48 -04:00