[lxc-devel] [lxc/lxc] ca5393: lxc-debian: fix regression when creating wheezy co...

GitHub noreply at github.com
Thu Aug 11 17:15:36 UTC 2016 

  Branch: refs/heads/stable-2.0
  Home:   https://github.com/lxc/lxc
  Commit: ca53937eb9b555631cadf693176e92a0c7fb9506
      https://github.com/lxc/lxc/commit/ca53937eb9b555631cadf693176e92a0c7fb9506
  Author: Antonio Terceiro <terceiro at debian.org>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  lxc-debian: fix regression when creating wheezy containers

The regression was introduced by commit
3c39b0b7a2b445e08d2e2aecb05566075f4f3423 which makes it possible to
create working stretch containers by forcinig `init` to be in the
included package list.

However, `init` didn't exit before jessie, so now for wheezy we
explicitly include `sysvinit`; sysvinit on wheezy is essential,
so it would already be included anyway.

Signed-off-by: Antonio Terceiro <terceiro at debian.org>


  Commit: 659ce93a2e405f928cd4e1a457270572571a8db8
      https://github.com/lxc/lxc/commit/659ce93a2e405f928cd4e1a457270572571a8db8
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M doc/ja/lxc-attach.sgml.in
    M doc/ko/lxc-attach.sgml.in
    M doc/lxc-attach.sgml.in

  Log Message:
  -----------
  Fix typo found by lintian

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: ea986a874775a0800194822aed9359e73297970d
      https://github.com/lxc/lxc/commit/ea986a874775a0800194822aed9359e73297970d
  Author: Rodrigo Vaz <rodrigo.vaz at gmail.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Add flag in mount_entry to skip NODEV in case of a persistent dev entry

Signed-off-by: Rodrigo Vaz <rodrigo at heroku.com>


  Commit: 5dc180dd2a87f69c912118dc78ae0ad9b3d1e206
      https://github.com/lxc/lxc/commit/5dc180dd2a87f69c912118dc78ae0ad9b3d1e206
  Author: Serge Hallyn <serge at hallyn.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/cgfsng.c

  Log Message:
  -----------
  cgfsng: don't pre-calculate path

First, we're doing this so long a there is any cgroup config item -
even if no devices ones.  Then if devices is not available we fail.
This was leading to Rob E's mysterious startup failures.

Secondly, we're not even using this info.  The user was removed
awhile back.

Signed-off-by: Serge Hallyn <serge at hallyn.com>


  Commit: 606cd0e7d053a69166af998a2c636844e7fdb502
      https://github.com/lxc/lxc/commit/606cd0e7d053a69166af998a2c636844e7fdb502
  Author: Christian Brauner <christian.brauner at mailbox.org>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  store criu version

- If version != NULL criu_version_ok() stores the detected criu version in
  version. Allocates memory for version which must be freed by caller.
- If version == NULL criu_version_ok() will return true when the version
  matches, false in all other cases.

Signed-off-by: Christian Brauner <cbrauner at suse.de>


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

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

  Log Message:
  -----------
  c/r: add support for CRIU's --action-script

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


  Commit: 6ce2eaee989818a577a5fbd6ce1187b2e8460ea6
      https://github.com/lxc/lxc/commit/6ce2eaee989818a577a5fbd6ce1187b2e8460ea6
  Author: Adrian Reber <areber at redhat.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  c/r: initialize migrate_opts properly

The commit "c/r: add support for CRIU's --action-script" breaks
lxc-checkpoint on the command-line. It produces errors like:

 sh: $'\260\366\b\001': command not found

and then it fails. src/lxc/criu.c expects migrate_opts->action_script to
be either NULL, then it is ignored, or to actually contain the name of
an action scripts.

As the struct migrate_opts has not static storage is has to be explicitly
initialized or the value of the structure's members is indeterminate.

Signed-off-by: Adrian Reber <areber at redhat.com>


  Commit: 3c6054ecdda3fe510d411576e4e827bd26591cd1
      https://github.com/lxc/lxc/commit/3c6054ecdda3fe510d411576e4e827bd26591cd1
  Author: Christian Brauner <christian.brauner at mailbox.org>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

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

  Log Message:
  -----------
  add missing cgroup namespace to ns_info struct

Signed-off-by: Christian Brauner <cbrauner at suse.de>


  Commit: 2fdca63d45448ffaa602e696865e456744fc0752
      https://github.com/lxc/lxc/commit/2fdca63d45448ffaa602e696865e456744fc0752
  Author: Adrian Reber <areber at redhat.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

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

  Log Message:
  -----------
  c/r: drop in-flight connections during CRIU dump

Shortly after CRIU 2.3 has been released a patch has been added to skip
in-flight TCP connections. In-flight connections are not completely
established connections (SYN, SYN-ACK). Skipping in-flight TCP
connections means that the client has to re-initiate the connection
establishment.

This patch stores the CRIU version detected during version check, so
that during dump/checkpoint options can be dynamically enabled depending
on the available CRIU version.

v2:
   * use the newly introduced criu version interface
   * add an option to disable skipping in-flight connections

Signed-off-by: Adrian Reber <areber at redhat.com>


  Commit: 3e4b0221c4a5f4e815fe2fed6ccef90d8df507f0
      https://github.com/lxc/lxc/commit/3e4b0221c4a5f4e815fe2fed6ccef90d8df507f0
  Author: Adrian Reber <areber at redhat.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: make local function static

This is a minimal commit which makes the function 'do_restore()' static
as it is not used anywhere else in the code. This also removes a
trailing space my editor complained about.

Signed-off-by: Adrian Reber <areber at redhat.com>


  Commit: ceb3af7985ef3621607fb1416064722c93f37692
      https://github.com/lxc/lxc/commit/ceb3af7985ef3621607fb1416064722c93f37692
  Author: Vitaly Lavrov <vel21ripn at gmail.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Set up MTU for vlan-type interfaces.

Signed-off-by: Vitaly Lavrov <vel21ripn at gmail.com>


  Commit: 9b867606336ef91bb1528683f1ef7730c627bf1e
      https://github.com/lxc/lxc/commit/9b867606336ef91bb1528683f1ef7730c627bf1e
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

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

  Log Message:
  -----------
  lxccontainer: detect if we should send SIGRTMIN+3

This is required by systemd to cleanly shutdown. Other init systems should not
have SIGRTMIN+3 in the blocked signals set.

Signed-off-by: Christian Brauner <cbrauner at suse.de>


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

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

  Log Message:
  -----------
  c/r: add support for ghost-limit in CRIU

This is an old option that we probably should have exposed long ago :)

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


  Commit: 66d0074a92cefb9a894590330dea6f6ac80b465b
      https://github.com/lxc/lxc/commit/66d0074a92cefb9a894590330dea6f6ac80b465b
  Author: Andreas Freudenberg <andreas.freudenberg at licomonch.net>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  templates: avoid noisy perl warnings caused by missing locales

Signed-off-by: Andreas Freudenberg <andreas.freudenberg at licomonch.net>


  Commit: 01af742a7b77d85c8f52da16e281b72415f46f9d
      https://github.com/lxc/lxc/commit/01af742a7b77d85c8f52da16e281b72415f46f9d
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: use PRIu64 format specifier

Fixes build failures on arm:

criu.c: In function ‘exec_criu’:
criu.c:310:4: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ [-Werror=format=]
    ret = sprintf(ghost_limit, "%lu", opts->user->ghost_limit);
    ^
In file included from criu.c:42:0:
log.h:285:9: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ [-Werror=format=]
  struct lxc_log_locinfo locinfo = LXC_LOG_LOCINFO_INIT;  \
   ^
criu.c:312:5: note: in expansion of macro ‘ERROR’
     ERROR("failed to print ghost limit %lu", opts->user->ghost_limit);
     ^

Signed-off-by: Christian Brauner <cbrauner at suse.de>


  Commit: 166f25a5d5574393fa492c049f8397f207c89b46
      https://github.com/lxc/lxc/commit/166f25a5d5574393fa492c049f8397f207c89b46
  Author: Jakub Jirutka <jakub at jirutka.cz>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M config/templates/alpine.common.conf.in

  Log Message:
  -----------
  lxc-alpine: mount tmpfs under /run

When running under grsecurity kernel or userns, it can't be mounted from inside.

Signed-off-by: Jakub Jirutka <jakub at jirutka.cz>


  Commit: c05143a121a285a24143a20974e1be2d2a3cd298
      https://github.com/lxc/lxc/commit/c05143a121a285a24143a20974e1be2d2a3cd298
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/cgfsng.c

  Log Message:
  -----------
  cgfsng: fix is_lxcfs() and is_cgroupfs()

Both functions advertise that they return true when strncmp() == 0 and false
when strncmp() != 0 but so far they returned the exact opposite.

Signed-off-by: Christian Brauner <cbrauner at suse.de>


  Commit: 11178e280df0aa182e0e27f5a8f7aa0696ba9e6a
      https://github.com/lxc/lxc/commit/11178e280df0aa182e0e27f5a8f7aa0696ba9e6a
  Author: Sergio Schvezov <sergio.schvezov at ubuntu.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M lxc.pc.in

  Log Message:
  -----------
  Add a prefix to the lxc.pc

This allows installing to different locations and using
the lxc.pc to build using the generated includedir and
libdir.

Signed-off-by: Sergio Schvezov <sergio.schvezov at ubuntu.com>


  Commit: d27a62b1276c929f757ed563200f66444965d5ca
      https://github.com/lxc/lxc/commit/d27a62b1276c929f757ed563200f66444965d5ca
  Author: oc <chenhaiq at yunify.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/attach.c

  Log Message:
  -----------
  attach: setns instead of unshare in lxc-attach

lxc-checkpoint will fail because process createdy by lxc-attach has
incorrect cgroup ns. It needs to use "setns" instead of "unshare"
to set cgroup ns.

Signed-off-by: Chen Haiquan <oc at yunify.com>


  Commit: d2a1437f28ef4f70330b57bc529b67be9df23cc6
      https://github.com/lxc/lxc/commit/d2a1437f28ef4f70330b57bc529b67be9df23cc6
  Author: Wolfgang Bumiller <w.bumiller at proxmox.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  conf: set pty_info to NULL after free

This fixes a double free corruption on container-requested
reboots when lxc_spawn() fails before receiving the ttys, as
lxc_fini() (part of __lxc_start()'s cleanup) calls
lxc_delete_tty().

Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>


  Commit: 8e3ce6b09e2817883bfc7d5497843e212f3ad5ed
      https://github.com/lxc/lxc/commit/8e3ce6b09e2817883bfc7d5497843e212f3ad5ed
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  criu: replace tmpnam() with mkstemp()

Signed-off-by: Christian Brauner <cbrauner at suse.de>


  Commit: b5e153dee105e6890c4336db72b986d6d4004e78
      https://github.com/lxc/lxc/commit/b5e153dee105e6890c4336db72b986d6d4004e78
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/Makefile.am
    M src/lxc/cgfs.c
    M src/lxc/cgfsng.c
    M src/lxc/cgmanager.c
    M src/lxc/conf.c
    M src/lxc/confile.c
    M src/lxc/criu.c
    M src/lxc/lxc_copy.c
    M src/lxc/lxc_create.c
    M src/lxc/lxc_snapshot.c
    M src/lxc/lxccontainer.c
    M src/lxc/start.c

  Log Message:
  -----------
  bdev: add subdirectories to search path

This allows us to avoid using relative includes which is cleaner in the long
run when we create subdirectories for other components of liblxc.

Signed-off-by: Christian Brauner <cbrauner at suse.de>


  Commit: b815882690ed3a52d69ca5144b087ffa9c53acb9
      https://github.com/lxc/lxc/commit/b815882690ed3a52d69ca5144b087ffa9c53acb9
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/Makefile.am
    R src/lxc/cgfs.c
    R src/lxc/cgfsng.c
    R src/lxc/cgmanager.c
    R src/lxc/cgroup.c
    R src/lxc/cgroup.h
    A src/lxc/cgroups/cgfs.c
    A src/lxc/cgroups/cgfsng.c
    A src/lxc/cgroups/cgmanager.c
    A src/lxc/cgroups/cgroup.c
    A src/lxc/cgroups/cgroup.h

  Log Message:
  -----------
  cgroups: move cgroup files to common subfolder

Signed-off-by: Christian Brauner <cbrauner at suse.de>


  Commit: 5a21336025eec5b4228994d0efece129257411bd
      https://github.com/lxc/lxc/commit/5a21336025eec5b4228994d0efece129257411bd
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M configure.ac
    M src/lxc/Makefile.am
    R src/lxc/lxc-checkconfig.in
    R src/lxc/lxc-start-ephemeral.in
    R src/lxc/lxc-top.lua
    R src/lxc/lxc_attach.c
    R src/lxc/lxc_autostart.c
    R src/lxc/lxc_cgroup.c
    R src/lxc/lxc_checkpoint.c
    R src/lxc/lxc_clone.c
    R src/lxc/lxc_config.c
    R src/lxc/lxc_console.c
    R src/lxc/lxc_copy.c
    R src/lxc/lxc_create.c
    R src/lxc/lxc_destroy.c
    R src/lxc/lxc_device.c
    R src/lxc/lxc_execute.c
    R src/lxc/lxc_freeze.c
    R src/lxc/lxc_info.c
    R src/lxc/lxc_init.c
    R src/lxc/lxc_ls.c
    R src/lxc/lxc_monitor.c
    R src/lxc/lxc_snapshot.c
    R src/lxc/lxc_start.c
    R src/lxc/lxc_stop.c
    R src/lxc/lxc_top.c
    R src/lxc/lxc_unfreeze.c
    R src/lxc/lxc_unshare.c
    R src/lxc/lxc_usernsexec.c
    R src/lxc/lxc_wait.c
    A src/lxc/tools/lxc-checkconfig.in
    A src/lxc/tools/lxc-start-ephemeral.in
    A src/lxc/tools/lxc-top.lua
    A src/lxc/tools/lxc_attach.c
    A src/lxc/tools/lxc_autostart.c
    A src/lxc/tools/lxc_cgroup.c
    A src/lxc/tools/lxc_checkpoint.c
    A src/lxc/tools/lxc_clone.c
    A src/lxc/tools/lxc_config.c
    A src/lxc/tools/lxc_console.c
    A src/lxc/tools/lxc_copy.c
    A src/lxc/tools/lxc_create.c
    A src/lxc/tools/lxc_destroy.c
    A src/lxc/tools/lxc_device.c
    A src/lxc/tools/lxc_execute.c
    A src/lxc/tools/lxc_freeze.c
    A src/lxc/tools/lxc_info.c
    A src/lxc/tools/lxc_init.c
    A src/lxc/tools/lxc_ls.c
    A src/lxc/tools/lxc_monitor.c
    A src/lxc/tools/lxc_snapshot.c
    A src/lxc/tools/lxc_start.c
    A src/lxc/tools/lxc_stop.c
    A src/lxc/tools/lxc_top.c
    A src/lxc/tools/lxc_unfreeze.c
    A src/lxc/tools/lxc_unshare.c
    A src/lxc/tools/lxc_usernsexec.c
    A src/lxc/tools/lxc_wait.c
    M src/tests/Makefile.am
    M src/tests/cgpath.c

  Log Message:
  -----------
  tools, tests: reorganize repo

- tools: move lxc commands to common subfolder
- tests: adapt include search path

Signed-off-by: Christian Brauner <cbrauner at suse.de>


  Commit: a7104b0b68e29ea29386359bb08577d026072fc1
      https://github.com/lxc/lxc/commit/a7104b0b68e29ea29386359bb08577d026072fc1
  Author: Wolfgang Bumiller <w.bumiller at proxmox.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/tools/lxc_attach.c

  Log Message:
  -----------
  add -f option to lxc-attach

Otherwise a container with a non-standard configuration file
can be started but not attached to.
Fixes the following case:
 # lxc-start -n ct -f /different/path/my.config
 # lxc-attach -n ct
 Error: container ct is not defined

Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>


  Commit: 5caa1713c6d4b41d98f3189f42aeb7f3e9080c06
      https://github.com/lxc/lxc/commit/5caa1713c6d4b41d98f3189f42aeb7f3e9080c06
  Author: Wolfgang Bumiller <w.bumiller at proxmox.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/tools/lxc_attach.c

  Log Message:
  -----------
  whitespace cleanup

The rest of this block uses spaces instead of tabs already.

Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>


  Commit: ff48886e1d46d86ee8b16ef38672bd4368474706
      https://github.com/lxc/lxc/commit/ff48886e1d46d86ee8b16ef38672bd4368474706
  Author: Carlo Landmeter <clandmeter at gmail.com>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M templates/lxc-alpine.in

  Log Message:
  -----------
  templates: add support for new arch on Alpine Linux

Signed-off-by: Carlo Landmeter <clandmeter at gmail.com>


  Commit: e75ec2bbb93154055cbd0f80fdd8f5976196da32
      https://github.com/lxc/lxc/commit/e75ec2bbb93154055cbd0f80fdd8f5976196da32
  Author: Christian Brauner <cbrauner at suse.de>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M src/lxc/bdev/lxcloop.c
    M src/lxc/cgroups/cgfs.c
    M src/lxc/cgroups/cgfsng.c
    M src/lxc/conf.c
    M src/lxc/confile.c
    M src/lxc/lxccontainer.c
    M src/lxc/start.c
    M src/lxc/utils.c

  Log Message:
  -----------
  tree-wide: replace readdir_r() with readdir()

Signed-off-by: Christian Brauner <cbrauner at suse.de>


  Commit: d7538219961a4cb12b0f7132be4c3bad713b4dd7
      https://github.com/lxc/lxc/commit/d7538219961a4cb12b0f7132be4c3bad713b4dd7
  Author: Andreas Freudenberg <andreas.freudenberg at licomonch.net>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  templates: add more quotes to variables (at least $rootfs should now be covered)

Signed-off-by: Andreas Freudenberg <andreas.freudenberg at licomonch.net>


  Commit: c71f845ce4728b16b18c6d145c13a2e81061376d
      https://github.com/lxc/lxc/commit/c71f845ce4728b16b18c6d145c13a2e81061376d
  Author: Andreas Freudenberg <andreas.freudenberg at licomonch.net>
  Date:   2016-08-11 (Thu, 11 Aug 2016)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  templates: make shellcheck (Ubuntu: 0.3.7-5 amd64) most possible happy

Signed-off-by: Andreas Freudenberg <andreas.freudenberg at licomonch.net>


Compare: https://github.com/lxc/lxc/compare/5c27394ee7a2...c71f845ce472

More information about the lxc-devel mailing list