[lxc-devel] [lxc/lxc] 02fdb5: don't make sysv init scripts dependant on distribu...

GitHub noreply at github.com
Wed May 11 19:44:05 UTC 2016


  Branch: refs/heads/stable-2.0
  Home:   https://github.com/lxc/lxc
  Commit: 02fdb536a98e116232548dff6c2faed849e8796f
      https://github.com/lxc/lxc/commit/02fdb536a98e116232548dff6c2faed849e8796f
  Author: Evgeni Golov <evgeni at debian.org>
  Date:   2016-05-11 (Wed, 11 May 2016)

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

  Log Message:
  -----------
  don't make sysv init scripts dependant on distribution specifics

- /etc(/rc.d)?/init.d/functions does not exist on all distributions
- LSB does not define a message function without an explicit status
- Debian-derived systems add a log_daemon_msg for that

lets define an own log_daemon_msg as echo and try to load LSB init
functions afterwards, which might overload it with a nicer version

that way the init scripts should work on any system, without hard
dependencies on neither LSB nor /etc/init.d/functions

Closes #309 #310 #311

Signed-off-by: Evgeni Golov <evgeni at debian.org>


  Commit: 3aec413b1db19ba45ef0c5cd3c5a05c76ffeda4c
      https://github.com/lxc/lxc/commit/3aec413b1db19ba45ef0c5cd3c5a05c76ffeda4c
  Author: Andrey Jr. Melnikov <temnota.am at gmail.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/console.c

  Log Message:
  -----------
  Switch console pty to raw mode. Without this some ncurses-based programs behave incorrectly

Signed-off-by: Andrey Jr. Melnikov <temnota.am at gmail.com>


  Commit: 41d080b9c523087b07db577552d7aa261064eb75
      https://github.com/lxc/lxc/commit/41d080b9c523087b07db577552d7aa261064eb75
  Author: Christian Brauner <christian.brauner at mailbox.org>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/console.c

  Log Message:
  -----------
  use raw settings of ssh for pty

Signed-off-by: Christian Brauner <christian.brauner at mailbox.org>


  Commit: 222306afba0067f99acf422728196b5e8122f760
      https://github.com/lxc/lxc/commit/222306afba0067f99acf422728196b5e8122f760
  Author: Leonid Isaev <leonid.isaev at jila.colorado.edu>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Initialize a pointer in split_init_cmd() to avoid gcc warnings

gcc -Wall warns about uninitialized variables (-Wmaybe-uninitialized), and
-Werror makes it fatal. This change allows the build to succeed by NULL'ifying
the pointer passed to strtok_r().

Note that strtok_r(3) anyway ignores a non-NULL arg3 pointer on the 1st call
with non-NULL arg1 string.

Signed-off-by: Leonid Isaev <leonid.isaev at jila.colorado.edu>
Acked-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: 4a060c9eec38c00ab6cf7fe578a820b37bdb2649
      https://github.com/lxc/lxc/commit/4a060c9eec38c00ab6cf7fe578a820b37bdb2649
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  Update maintainers

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


  Commit: b1b14a4e3e215e228d09d99911603b25b98049b7
      https://github.com/lxc/lxc/commit/b1b14a4e3e215e228d09d99911603b25b98049b7
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2016-05-11 (Wed, 11 May 2016)

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

  Log Message:
  -----------
  doc: Add logging option to Japanese lxc-attach(1)

Update for commit f43d63b

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>


  Commit: 65fcb7586ee712decd281385224bb328232da35e
      https://github.com/lxc/lxc/commit/65fcb7586ee712decd281385224bb328232da35e
  Author: Christian Brauner <christian.brauner at mailbox.org>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/lxc_ls.c

  Log Message:
  -----------
  lxc-ls: use fewer syscalls when doing ipc

Signed-off-by: Christian Brauner <christian.brauner at mailbox.org>


  Commit: 5a537be50d524394fa0eb5dbd87ff98712cdd32c
      https://github.com/lxc/lxc/commit/5a537be50d524394fa0eb5dbd87ff98712cdd32c
  Author: Christian Brauner <christian.brauner at mailbox.org>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/lxc_ls.c

  Log Message:
  -----------
  lxc-ls: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner at mailbox.org>


  Commit: 2e6f901460f00f8007dcc13725c1ed4568a85a95
      https://github.com/lxc/lxc/commit/2e6f901460f00f8007dcc13725c1ed4568a85a95
  Author: walkerning <foxdoraame at gmail.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/lxc-checkconfig.in

  Log Message:
  -----------
  Check if stdout is a terminal in lxc-checkconfig

Let lxc-checkconfig write to non-tty stdout without color control
characters
Signed-off-by: walkerning <foxdoraame at gmail.com>


  Commit: 225ced0f4e32c5c47d7d68793b787b8fc9eb9969
      https://github.com/lxc/lxc/commit/225ced0f4e32c5c47d7d68793b787b8fc9eb9969
  Author: Aron Podrigal <aronp at guaranteedplus.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/python-lxc/lxc.c

  Log Message:
  -----------
  Fixed - set PyErr when Container.__init__ fails

When container init failed for whatever reason, previously it resulted
in a `SystemError: NULL result without error in PyObject_Call`
This will now result in a RuntimeError with the error message
previously printed to stderr.

Signed-off-by: Aron Podrigal <aronp at guaranteedplus.com>


  Commit: 2da19674b645f89c5114274afe8266f28ede328e
      https://github.com/lxc/lxc/commit/2da19674b645f89c5114274afe8266f28ede328e
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

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

  Log Message:
  -----------
  doc: Add logging option to Korean lxc-attach(1)

Update for commit f43d63b

Signed-off-by: Sungbae Yoo <sungbae.yoo at samsung.com>


  Commit: 2a385c0d8ebe9619072a66476cd8624f781178a0
      https://github.com/lxc/lxc/commit/2a385c0d8ebe9619072a66476cd8624f781178a0
  Author: Thomas Tanaka <thomas.tanaka at oracle.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M templates/lxc-oracle.in
    M templates/lxc-sparclinux.in

  Log Message:
  -----------
  Improve on the case where default networking config is incomplete

Signed-off-by: Thomas Tanaka <thomas.tanaka at oracle.com>


  Commit: 3fb82bafe07df61c6ba8f232568189ec39a5c030
      https://github.com/lxc/lxc/commit/3fb82bafe07df61c6ba8f232568189ec39a5c030
  Author: Lisio <andrey at kostin.email>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M templates/lxc-alpine.in

  Log Message:
  -----------
  Force DHCP client to send hostname

Required for proper applying dnsmasq config entries.

Signed-off-by: Andrey Kostin <andrey at kostin.email>


  Commit: f55f607dcba8698956ffebcd5df9c63f1da9dca3
      https://github.com/lxc/lxc/commit/f55f607dcba8698956ffebcd5df9c63f1da9dca3
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/sync.c

  Log Message:
  -----------
  sync: fail on unexpected message sizes

I think (?) this may be related to our hanging monitor bug. Let's do this
anyway, as it's probably a good idea.

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


  Commit: 38d122cfbb38b64614f5b8b314e99285d5da03ce
      https://github.com/lxc/lxc/commit/38d122cfbb38b64614f5b8b314e99285d5da03ce
  Author: Karl-Johan Karlsson <creideiki at ferretporn.se>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M config/templates/gentoo.moresecure.conf.in
    M config/templates/slackware.common.conf.in

  Log Message:
  -----------
  Change sys_resources to sys_resource.

gentoo.moresecure.conf tries to drop the capability CAP_SYS_RESOURCES.
However, that capability doesn't exist, so the container doesn't start.
Change it to CAP_SYS_RESOURCE, according to capabilities(7).

Also correct the same typo in a comment in slackware.common.conf.

Signed-off-by: Karl-Johan Karlsson <creideiki at ferretporn.se>


  Commit: e1a2c96c0d14a8b83bc141b4116dc87dadb639e6
      https://github.com/lxc/lxc/commit/e1a2c96c0d14a8b83bc141b4116dc87dadb639e6
  Author: Christian Brauner <christian.brauner at mailbox.org>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/sync.c

  Log Message:
  -----------
  sync.c: use correct types

Signed-off-by: Christian Brauner <christian.brauner at mailbox.org>


  Commit: 563148e2df423ca51c1878cd6f5370a69d58744f
      https://github.com/lxc/lxc/commit/563148e2df423ca51c1878cd6f5370a69d58744f
  Author: Hartnell Foster <hartnell.foster at bbc.co.uk>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M templates/lxc-centos.in

  Log Message:
  -----------
  Added OR statement for cases of ID = rhel in RHEL 7+

Signed-off-by: Hartnell Foster <hartnell.foster at bbc.co.uk>


  Commit: 9e0148cfda29169f26b6d578eee3e583ce082813
      https://github.com/lxc/lxc/commit/9e0148cfda29169f26b6d578eee3e583ce082813
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

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

  Log Message:
  -----------
  Unshare netns after setting the userns mappings

so that there is a root uid mapping for the /proc/net files.

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


  Commit: 015d4e48f342ba67c0c6ab3677fc9671e0be4b77
      https://github.com/lxc/lxc/commit/015d4e48f342ba67c0c6ab3677fc9671e0be4b77
  Author: Aron Podrigal <aronp at guaranteedplus.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/confile.c

  Log Message:
  -----------
  Added `type` to keys in lxc_list_nicconfigs

Signed-off-by: Aron Podrigal <aronp at guaranteedplus.com>


  Commit: 04503173e5aaf1412dfd09275eafa272b1e0fa3f
      https://github.com/lxc/lxc/commit/04503173e5aaf1412dfd09275eafa272b1e0fa3f
  Author: Stewart Brodie <stewart at metahusky.net>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M src/lxc/confile.c

  Log Message:
  -----------
  Allow configuration file values to be quoted

If the value starts and ends with matching quote characters, those
characters are stripped automatically.   Quote characters are the
single quote (') or double quote (").  The quote removal is done after
the whitespace trimming.

This is needed particularly in order that lxc.environment values may
have trailing spaces.  However, the quote removal is done for all values
in the parse_line function, as it has non-const access to the value.

Signed-off-by: Stewart Brodie <stewart at metahusky.net>


  Commit: 28e42b622a53a382151b500a8342645b49136cd1
      https://github.com/lxc/lxc/commit/28e42b622a53a382151b500a8342645b49136cd1
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

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

  Log Message:
  -----------
  log: remove duplicate definitons and bump buffer size

When writing out the CRIU exec command, we're bumping up against the buffer
size limit. Let's increase it so we can avoid:

lxc 20160509213229.921 WARN     lxc_log - log.c:log_append_logfile:111 - truncated next event from 523 to 512 bytes

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


  Commit: 9d928ec50fd75f7f392c7978395ec755650587f3
      https://github.com/lxc/lxc/commit/9d928ec50fd75f7f392c7978395ec755650587f3
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

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

  Log Message:
  -----------
  c/r: rearrange things to pass struct migrate_opts all the way down

If we don't do this, we'll end up changing the function signatures for the
internal __criu_* functions each time we add a new parameter, which will
get very annoying very quickly. Since we already have the user's arguments
struct, let's just pass that all the way down.

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


  Commit: c6c37c20326c7fcd8a2f072263188cc84c403955
      https://github.com/lxc/lxc/commit/c6c37c20326c7fcd8a2f072263188cc84c403955
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

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

  Log Message:
  -----------
  c/r: add an option to use faster inotify support in CRIU

The idea here is that criu can use open_by_handle on a configuration which
will preserve inodes on moves across hosts, but shouldn't do that on
configurations which won't preserve inodes. Before, we forced it to always
be slow, but we don't have to do this.

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


  Commit: b03f1f4ac3666abd032ddc617823213568ad577b
      https://github.com/lxc/lxc/commit/b03f1f4ac3666abd032ddc617823213568ad577b
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M config/apparmor/abstractions/container-base
    M config/apparmor/abstractions/container-base.in

  Log Message:
  -----------
  Also allow fstype=fuse for fuse filesystems

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


  Commit: 6897137846ebeb1a0b1ee1b1d76fddf8b71024cc
      https://github.com/lxc/lxc/commit/6897137846ebeb1a0b1ee1b1d76fddf8b71024cc
  Author: Jesse Pretorius <jesse.pretorius at rackspace.co.uk>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M templates/lxc-ubuntu.in

  Log Message:
  -----------
  Add apt-transport-https to minbase variant packages_template

In many environments the preference is to configure containers with
apt mirrors that are SSL-secured.

When building containers using the download template this can't be
done unless an insecure mirror is first used to install the
apt-transport-https package, then the sources reconfigured to
use the https URL.

When building containers without using the download template this
can't be done unless the container creator specifically includes
this package in the package list at build time.

It seems more intuitive to me to have the package installed by
default. This patch includes the required package for the minbase
variant only as this is the default.

Signed-off-by: Jesse Pretorius <jesse.pretorius at rackspace.co.uk>


Compare: https://github.com/lxc/lxc/compare/0eb12ed50454...6897137846eb


More information about the lxc-devel mailing list