[lxc-devel] [lxc/lxc] d24095: Fix ABI compatibility

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: d24095e46ad68ae5a770cbd23ac29dce22da3fd8
      https://github.com/lxc/lxc/commit/d24095e46ad68ae5a770cbd23ac29dce22da3fd8
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M src/lxc/lxccontainer.h

  Log Message:
  -----------
  Fix ABI compatibility

Until we bump the SONAME to liblxc2, only symbol additions and struct
member additions are allowed.

Adding struct members in the middle of the struct breaks backward
compatibility.

This commit makes it clear when struct members were added and moves a
few members that were added in the middle of the 1.0 struct to the end
of it.

Note that unfortunately that means we're breaking backward compatibility
between LXC 1.1.0 and the state after this commit, given 1.1 is
reasonably new, this is the least damaging way of fixing the problem.

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 59c2d40689e348e3c86a2fec410ec5741d3aec77
      https://github.com/lxc/lxc/commit/59c2d40689e348e3c86a2fec410ec5741d3aec77
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: remember to clean up pidfile

When restoring, we didn't clean up the pidfile that criu uses to pass us the
init pid on error or success; let's do that.

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: de0dc533073ce82701e392e97b86029dc0857338
      https://github.com/lxc/lxc/commit/de0dc533073ce82701e392e97b86029dc0857338
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M doc/ja/lxc.container.conf.sgml.in

  Log Message:
  -----------
  doc: Add the description of lxc.hook.destroy in Japanese lxc.container.conf(5)

Update for commit 37cf711

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 27be573155c3f6559db22b446e6cb10cb7e5ab54
      https://github.com/lxc/lxc/commit/27be573155c3f6559db22b446e6cb10cb7e5ab54
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M src/lxc/cgmanager.c

  Log Message:
  -----------
  cgmanager: attach: never use 'all' controller

We were using 'all' controller if current was in all the
same cgroup.  That doesn't suffice.  We'd have to check
the target.  At that point we may as well just attach
controller by controller.

An optimization to consider is to check the /proc/initpid/cgroup
for all identical controllers.  Let's start by just getting it
right.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 454ec0abc7f315fa4894c43488c981f369cacce9
      https://github.com/lxc/lxc/commit/454ec0abc7f315fa4894c43488c981f369cacce9
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  api_start: always close fds 0-2 when daemonized

commit 507cee3618237d3 moved the close and re-open of fds 0-2 into
do_start.  But this means that the lxc monitor itself keeps the
caller's fds 0-2 open, which is wrong for daemonized containers.

Closes #548

Reported-by: Mathieu Le Marec - Pasquet <kiorky at cryptelium.net>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/31a882ef3a5e...454ec0abc7f3