]> git.proxmox.com Git - mirror_lxc.git/commit - configure.ac
c/r: put lxc-restore-net in /usr/share
authorTycho Andersen <tycho.andersen@canonical.com>
Wed, 22 Oct 2014 22:25:02 +0000 (22:25 +0000)
committerStéphane Graber <stgraber@ubuntu.com>
Mon, 27 Oct 2014 15:31:38 +0000 (11:31 -0400)
commit0080bebf3195a4a4f4868d89224e07658a1fccca
tree2ea93a6c94905846fdcd6975d3ab803741b6b7e7
parentbf1e86368272a7c342ad1eea6d61ac3694e182bf
c/r: put lxc-restore-net in /usr/share

On restore, we pass criu a script to manage the network interfaces (i.e. the
full path to lxc-restore-net), which we previously installed into
/var/lib/<tuple>/lxc. However, this is also the directory that is the default
for use in mounting the rootfs locally before pivot_root()ing. So, we mounted
the rootfs and then happliy called criu, pointing it to this directory which
didn't have lxc-restore-net any more, it just had the container's rootfs.
Instead, we should put lxc-restore-net somewhere else, so that criu can still
see it after the rootfs is mounted.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
configure.ac
src/lxc/Makefile.am
src/lxc/lxccontainer.c