[lxc-devel] [lxc/lxc] 8164f0: api wrapper: only reset the current config if this...

Thu Dec 10 04:01:26 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 8164f0e253e9c148a3c3c09eec5e0ebe56602805
      https://github.com/lxc/lxc/commit/8164f0e253e9c148a3c3c09eec5e0ebe56602805
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  api wrapper: only reset the current config if this call set it

Instead of *always* resetting the current_config to null, we should only
reset it if this API call set it.

This allows nesting of API calls, e.g. c->checkpoint() can pass stuff into
criu.c, which can call c->init_pid() and not lose the ability to log stuff
afterwards.

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

  Commit: 6bf5b3da1eb7db1f488e5d13aee592afdde7021c
      https://github.com/lxc/lxc/commit/6bf5b3da1eb7db1f488e5d13aee592afdde7021c
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M src/lxc/criu.h

  Log Message:
  -----------
  c/r: bump criu version requirements

Since we're relying on 1.8 for the seccomp stuff, let's refuse to use
anything lower than that.

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

  Commit: aef3d51e61d8e65f31201e4a60eb4102ce5b4385
      https://github.com/lxc/lxc/commit/aef3d51e61d8e65f31201e4a60eb4102ce5b4385
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

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

  Log Message:
  -----------
  c/r: add a new ->migrate API call

This patch adds a new ->migrate API call with three commands:

MIGRATE_DUMP: this is basically just ->checkpoint()
MIGRATE_RESTORE: this is just ->restore()
MIGRATE_PRE_DUMP: this can be used to invoke criu's pre-dump command on the
    container.

A small addition to the (pre-)dump commands is the ability to specify a
previous partial dump directory, so that one can use a pre-dump of a
container.

Finally, this new API call uses a structure to pass options so that it can
be easily extended in the future (e.g. to CRIU's --leave-frozen option in
the future, for potentially smarter failure handling on restore).

v2: remember to flip the return code for legacy ->checkpoint and ->restore
    calls

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

  Commit: fa07124900989e1a2e617659093da293b583470f
      https://github.com/lxc/lxc/commit/fa07124900989e1a2e617659093da293b583470f
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: remove random line continuations

No idea how these got there, but let's get rid of them since they're weird.

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

  Commit: cdcae1034cb0e0ead1a3777ad5ce679e2a5883ef
      https://github.com/lxc/lxc/commit/cdcae1034cb0e0ead1a3777ad5ce679e2a5883ef
  Author: TAMUKI Shoichi <tamuki at linet.gr.jp>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M config/init/common/lxc-net.in

  Log Message:
  -----------
  Fold dnsmasq command line in lxc-net.in

Fold dnsmasq command line at about 80 chars because the line is too
long.

Signed-off-by: TAMUKI Shoichi <tamuki at linet.gr.jp>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

  Commit: af2d9fad6e333deabaf8eefc7c6caf9c96a0a280
      https://github.com/lxc/lxc/commit/af2d9fad6e333deabaf8eefc7c6caf9c96a0a280
  Author: TAMUKI Shoichi <tamuki at linet.gr.jp>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M configure.ac

  Log Message:
  -----------
  Add support for new target plamo to configure.ac

Add support for new target plamo to specify the linux distribution.
Plamo Linux uses sysvinit.

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Signed-off-by: TAMUKI Shoichi <tamuki at linet.gr.jp>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

  Commit: ba3004da531583d6ec7f2d8a8c17008b4684c721
      https://github.com/lxc/lxc/commit/ba3004da531583d6ec7f2d8a8c17008b4684c721
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

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

  Log Message:
  -----------
  Add LXC_TARGET env to Korean lxc.container.conf(5)

Update for commit c154af9

Signed-off-by: Sungbae Yoo <sungbae.yoo at samsung.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 06078509e389d093b85465e9eef9215928ee51a0
      https://github.com/lxc/lxc/commit/06078509e389d093b85465e9eef9215928ee51a0
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M src/lxc/cgfs.c
    M src/lxc/cgmanager.c
    M src/lxc/cgroup.c
    M src/lxc/cgroup.h

  Log Message:
  -----------
  cgroup: add cgroup_escape() call

We'll use this in the next patch to escape to the root cgroup before we
exec criu.

v2: s/cgm_connected/cmg_needs_disconnect/g

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

  Commit: e9195050b4abd0bc4c207457cb2f1f161b583fc8
      https://github.com/lxc/lxc/commit/e9195050b4abd0bc4c207457cb2f1f161b583fc8
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: escape cgroups before exec()ing criu

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

  Commit: f8a41688ec7a39d3151c846807c6d8ed8059d69d
      https://github.com/lxc/lxc/commit/f8a41688ec7a39d3151c846807c6d8ed8059d69d
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: add more logging when restore fails

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

  Commit: a7c6b8c7b731dcb44cd9e1ce17db284ae2a2a0cf
      https://github.com/lxc/lxc/commit/a7c6b8c7b731dcb44cd9e1ce17db284ae2a2a0cf
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M src/lxc/confile.c

  Log Message:
  -----------
  fix 'lxc.mount.entry' key when clearing unexpanded config

Closes #712

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/23820d548dcd...a7c6b8c7b731