[lxc-devel] [lxc/lxc] 73d467: criu: hide more stuff in criu.c

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 73d467522b29983a4c0e1d806a460432870ac5ff
      https://github.com/lxc/lxc/commit/73d467522b29983a4c0e1d806a460432870ac5ff
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
    M src/lxc/criu.c
    M src/lxc/criu.h

  Log Message:
  -----------
  criu: hide more stuff in criu.c

Various other functions/structures are now only used in criu.c, so let's
hide stuff there so as not to pollute headers.

This commit also bumps the required CRIU versions to 2.0. While we don't
*require* any features that aren't in 1.8 patchlevel 21 or above, 2.0 is a
vast improvement, and so we should use that instead.

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>


  Commit: 4b54788e85a4e2f423133354f8141ed02f795d71
      https://github.com/lxc/lxc/commit/4b54788e85a4e2f423133354f8141ed02f795d71
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-03-15 (Tue, 15 Mar 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: drop lxc.console=none config requirement

There are a few things going on in this patch.

1. /dev/console is an external mount since it is bind mounted from the
   host. However, we don't want to use criu's --ext-mount-map auto handling
   here, because that will bind mount exactly the same path from the host
   on restore, but if the pts device is different on the target host, we'll
   bind mount the wrong one, which is obviously wrong.

2. We need to tell CRIU how to restore the TTY. Since we declare the tty as
   --external, we need to provide it via --inherit-fd (even though we've
   already fixed up the environment).

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>


  Commit: 75d0c7b3f5f9ce25b03d17d2c2843d736555c459
      https://github.com/lxc/lxc/commit/75d0c7b3f5f9ce25b03d17d2c2843d736555c459
  Author: Stéphane Graber <stgraber at stgraber.org>
  Date:   2016-03-15 (Tue, 15 Mar 2016)

  Changed paths:
    M src/lxc/criu.c
    M src/lxc/criu.h

  Log Message:
  -----------
  Merge pull request #893 from tych0/dont-require-dev-console-none

Dont require dev console none


Compare: https://github.com/lxc/lxc/compare/f86f41616a9e...75d0c7b3f5f9