diff -Nru lxc-1.1.0~alpha2/debian/changelog lxc-1.1.0~alpha2/debian/changelog --- lxc-1.1.0~alpha2/debian/changelog 2014-10-09 12:25:47.000000000 -0500 +++ lxc-1.1.0~alpha2/debian/changelog 2014-10-27 19:38:52.000000000 -0500 @@ -1,3 +1,10 @@ +lxc (1.1.0~alpha2-0ubuntu4) vivid; urgency=medium + + * install lxc-restore-net to /usr/share so that it doesn't get overmounted by + the rootfs in preparation for restore. + + -- Tycho Andersen Mon, 27 Oct 2014 19:36:21 -0500 + lxc (1.1.0~alpha2-0ubuntu3) utopic; urgency=medium * fix usernic and apparmor-mounts tests to not clear out the host's diff -Nru lxc-1.1.0~alpha2/debian/patches/move-lxc-restore-net lxc-1.1.0~alpha2/debian/patches/0007-move-lxc-restore-net --- lxc-1.1.0~alpha2/debian/patches/0007-move-lxc-restore-net 1969-12-31 18:00:00.000000000 -0600 +++ lxc-1.1.0~alpha2/debian/patches/0007-move-lxc-restore-net 2014-10-27 20:11:28.000000000 -0500 @@ -0,0 +1,72 @@ +Description: 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//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. + . + lxc (1.1.0~alpha2-0ubuntu4) vivid; urgency=medium + . + * install lxc-restore-net to /usr/share so that it doesn't get overmounted by + the rootfs in preparation for restore. +Author: Tycho Andersen + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- lxc-1.1.0~alpha2.orig/configure.ac ++++ lxc-1.1.0~alpha2/configure.ac +@@ -533,6 +533,9 @@ AS_AC_EXPAND(LOGPATH, "$with_log_path") + AS_AC_EXPAND(RUNTIME_PATH, "$with_runtime_path") + AC_SUBST(DEFAULT_CGROUP_PATTERN, ["$with_cgroup_pattern"]) + ++# We need the install path so criu knows where to reference the hook scripts. ++AC_DEFINE_UNQUOTED([DATADIR], "$DATADIR", ["Prefix for shared files."]) ++ + # Check for some standard kernel headers + AC_CHECK_HEADERS([linux/unistd.h linux/netlink.h linux/genetlink.h], + [], +--- lxc-1.1.0~alpha2.orig/src/lxc/Makefile.am ++++ lxc-1.1.0~alpha2/src/lxc/Makefile.am +@@ -203,8 +203,6 @@ sbin_PROGRAMS = init.lxc + pkglibexec_PROGRAMS = \ + lxc-monitord \ + lxc-user-nic +-pkglibexec_SCRIPTS = \ +- lxc-restore-net + + AM_LDFLAGS = -Wl,-E + if ENABLE_RPATH +@@ -263,5 +261,8 @@ install-exec-local: install-soPROGRAMS + install-exec-hook: + chmod u+s $(DESTDIR)$(libexecdir)/lxc/lxc-user-nic + ++install-data-local: ++ install -c -m 755 lxc-restore-net $(DESTDIR)$(datadir)/lxc ++ + uninstall-local: + $(RM) $(DESTDIR)$(libdir)/liblxc.so* +--- lxc-1.1.0~alpha2.orig/src/lxc/lxccontainer.c ++++ lxc-1.1.0~alpha2/src/lxc/lxccontainer.c +@@ -3574,7 +3574,7 @@ static void exec_criu(struct criu_opts * + DECLARE_ARG("--force-irmap"); + DECLARE_ARG("--manage-cgroups"); + DECLARE_ARG("--action-script"); +- DECLARE_ARG(LIBEXECDIR "/lxc/lxc-restore-net"); ++ DECLARE_ARG(DATADIR "/lxc/lxc-restore-net"); + DECLARE_ARG("-D"); + DECLARE_ARG(opts->directory); + DECLARE_ARG("-o"); diff -Nru lxc-1.1.0~alpha2/debian/patches/series lxc-1.1.0~alpha2/debian/patches/series --- lxc-1.1.0~alpha2/debian/patches/series 2014-10-09 12:25:08.000000000 -0500 +++ lxc-1.1.0~alpha2/debian/patches/series 2014-10-27 20:10:26.000000000 -0500 @@ -4,3 +4,4 @@ 0004-fix-lxc-mount-auto-clearing 0005-lxc-test-unpriv-test-different-cgroups 0006-lxc-test-apparmor-mount-don-t-clear-out-etc-lxc-lxc-.patch +0007-move-lxc-restore-net