[lxc-devel] [lxc/lxc] 340f3a: Fix redefinition of struct in6_addr

[GitHub]

  Branch: refs/heads/stable-2.0
  Home:   https://github.com/lxc/lxc
  Commit: 340f3a48eba4174baa0bd8c6cc1ac989b420808a
      https://github.com/lxc/lxc/commit/340f3a48eba4174baa0bd8c6cc1ac989b420808a
  Author: Jörg Krause <joerg.krause at embedded.rocks>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  Fix redefinition of struct in6_addr

struct in6_addr is both defined in the C library header <netinet/in.h>
and the Linux kernel header <linux/in6.h>.

lxc_user_nic.c includes both <netinet/in.h> and <linux/if_bridge.h>. The
later one includes <linux/in6.h>.

This breaks build with the musl libc:
  error: redefinition of ‘struct in6_addr’

As lxc_user_nic.c does not use any references from <linux/if_bridge.h> it
is safe to remove this header.

Signed-off-by: Jörg Krause <joerg.krause at embedded.rocks>


  Commit: dafca21383c0c1df1da70c11a6501c153bec4c1b
      https://github.com/lxc/lxc/commit/dafca21383c0c1df1da70c11a6501c153bec4c1b
  Author: Aleksandr Mezin <mezin.alexander at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis: test VPATH builds

It looks like VPATH (split source and build directories) builds
are frequently broken. So let's test them on travis-ci.

Personally I use VPATH build in my deployment scripts.

Signed-off-by: Aleksandr Mezin <mezin.alexander at gmail.com>


  Commit: 934506f59c7322477cc9cdb2a787736f177010ba
      https://github.com/lxc/lxc/commit/934506f59c7322477cc9cdb2a787736f177010ba
  Author: Aleksandr Mezin <mezin.alexander at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis: ensure 'make install' doesn't fail

Signed-off-by: Aleksandr Mezin <mezin.alexander at gmail.com>


  Commit: 2991a7d0e1537bf7910c269f23448e3486ff242c
      https://github.com/lxc/lxc/commit/2991a7d0e1537bf7910c269f23448e3486ff242c
  Author: Evgeni Golov <evgeni at golov.de>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M config/init/systemd/lxc at .service.in

  Log Message:
  -----------
  start containers in foreground when using the lxc at .service

lxc-start started to default to daemonize the container when starting
this conflicts with type=simple of the systemd unit

call lxc-start with -F and thus force execution in foreground
that way we can feed the log to journald properly and keep type=simple

Debian-Bug: https://bugs.debian.org/826100
Signed-off-by: Evgeni Golov <evgeni at golov.de>


  Commit: b27223f1b9d1afa5703131c72cf0c35b0c27f997
      https://github.com/lxc/lxc/commit/b27223f1b9d1afa5703131c72cf0c35b0c27f997
  Author: Jesse Pretorius <jesse.pretorius at rackspace.co.uk>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M templates/lxc-ubuntu.in

  Log Message:
  -----------
  Move apt-transport-https to global 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.

Commit 396f75abb3d319adc7d871b94b08bc6bb9c49585 added the package
to the minbase variant, but this variant is not used by the download
template build process. The build process instead specifies no
variant, so this patch moves the package from the packages_template
package list in the minbase variant to the global packages_template
package list, ensuring that this package is included in all Ubuntu
build images that use the lxc-ubuntu template.

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


  Commit: 38788e4878f23a1be3479b3dde45c774340c82f8
      https://github.com/lxc/lxc/commit/38788e4878f23a1be3479b3dde45c774340c82f8
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M config/init/common/Makefile.am
    R config/init/common/lxc-devsetup
    M config/init/systemd/lxc.service.in
    M config/init/sysvinit/lxc-containers.in
    M config/init/upstart/lxc.conf.in
    M lxc.spec.in

  Log Message:
  -----------
  Drop lxc-devsetup as unneeded by current autodev

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


  Commit: 0cd7f6f94ed70c3f19329cfbd0bc659e331c21cb
      https://github.com/lxc/lxc/commit/0cd7f6f94ed70c3f19329cfbd0bc659e331c21cb
  Author: Thomas Tanaka <thomas.tanaka at oracle.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M templates/lxc-oracle.in

  Log Message:
  -----------
  Unable to login via console in OL7.2

There is container-getty.service with OL7.2 systemd, it
is also used for managing the getty service, use that
instead and not manually create it.

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


Compare: https://github.com/lxc/lxc/compare/b58725c65b47...0cd7f6f94ed7