1. 07 Apr, 2016 10 commits
  2. 04 Apr, 2016 28 commits
  3. 01 Apr, 2016 2 commits
    • Tycho Andersen's avatar
      restore: correctly restore cgroup mounts inside a container · 84a89b46
      Tycho Andersen authored
      Before the nsroot= mount option, we were just getting lucky because the
      cgroup superblocks "matched" when inspecting them from userspace, so we
      were actually getting a bind mount from the host when migrating from within
      cgroup namespaces.
      
      Instead, let's actually do a new (i.e. not a bind mount) for cgroup
      namespaces. For this, we need two things:
      
      1. to prepare the cgroup namespace (and thus the cgroups) before the mount
         ns, so when the mount() occurrs it is relative to the right cgroup path.
      
      2. not reject cgroup filesystems with no root. A cgroup ns mount looks
         like:
      
      	 223 222 0:22 /lxc/unpriv /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,xattr,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd,nsroot=/lxc/unpriv
      
         i.e. it has /lxc/unpriv as its root, and thus doesn't look rooted to CRIU.
         We use the fstype->parse hook to rewrite this root to /, since it
         is handled by the cgroup ns infrastructure.
      
      v2: add new fstype->munge hook, allowing fstypes to munge their parsed
          mountinfo entries if they want to. this allows us to get rid of the
          ugly hacks with FSTYPE__CGROUP everywhere in teh patch.
      v3: s/fstype->munge/fstype->parse for FSTYPE__CGROUP
      Signed-off-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
      84a89b46
    • Dmitry Safonov's avatar
      Makefile: drop 'rebuild' from help message · 870089d1
      Dmitry Safonov authored
      The target has been broken for some time without complaints from users.
      https://lists.openvz.org/pipermail/criu/2016-March/026525.html
      
      Cc: Cyrill Gorcunov <gorcunov@openvz.org>
      Signed-off-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
      Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
      870089d1