]> git.ipfire.org Git - thirdparty/lxc.git/commit
c/r: use criu option instead of lxc-restore-net
authorTycho Andersen <tycho.andersen@canonical.com>
Mon, 13 Apr 2015 18:54:27 +0000 (18:54 +0000)
committerStéphane Graber <stgraber@ubuntu.com>
Wed, 22 Apr 2015 16:29:46 +0000 (12:29 -0400)
commitcba98d127bf490b018a016b792ae05fd2d29c5ee
treeb604fa4dc755c3a4897c69093e7c1b7b3cfb480f
parent40962b642d24f476e5ff59d97ba64cf5730ceb28
c/r: use criu option instead of lxc-restore-net

As of criu 1.5, the --veth-pair argument supports an additional parameter that
is the bridge name to attach to. This enables us to get rid of the goofy
action-script hack that passed bridge names as environment variables.

This patch is on top of the systemd/lxcfs mount rework patch, as we probably
want to wait to use 1.5 options until it has been out for a while and is in
distros.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
src/lxc/Makefile.am
src/lxc/lxc-restore-net [deleted file]
src/lxc/lxccontainer.c