[lxc-devel] [lxc/lxc] 1f5666: remove extra 'ret'

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 1f56665557fb75898cb9cbf550063cc8259cf9ad
      https://github.com/lxc/lxc/commit/1f56665557fb75898cb9cbf550063cc8259cf9ad
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  remove extra 'ret'

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


  Commit: f3886023c18ce703cb05425d33d8c4e3ca441a3f
      https://github.com/lxc/lxc/commit/f3886023c18ce703cb05425d33d8c4e3ca441a3f
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: write status only after trying to parse the pid

Previously, we write a "success" status but tried to parse the pid. This
meant that we wouldn't notice a successful restore but failure to parse the
pid, which was a little strange.

We still don't know the child pid, so we will end up with a restored
process tree and a running container, but at least in this case the API
will return false indicating that something failed.

We could kill(-1, 9) in this case, but since liblxc runs as root sometimes
(e.g. LXD), that would be a Very Bad Thing.

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


  Commit: 43ae0e64b7e1dd93a5b5dc6ffa1bf1a519402743
      https://github.com/lxc/lxc/commit/43ae0e64b7e1dd93a5b5dc6ffa1bf1a519402743
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  Merge pull request #1155 from tych0/migration-fixes

Migration fixes


Compare: https://github.com/lxc/lxc/compare/605bb3c84783...43ae0e64b7e1