[lxc-devel] [lxc/lxc] 1f6cf6: tests: Try to make shutdowntest a bit more robust

GitHub noreply at github.com
Fri Apr 4 23:31:43 UTC 2014


  Branch: refs/heads/stable-1.0
  Home:   https://github.com/lxc/lxc
  Commit: 1f6cf68655951752fa66d72c44812989e2187b4a
      https://github.com/lxc/lxc/commit/1f6cf68655951752fa66d72c44812989e2187b4a
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M src/tests/shutdowntest.c

  Log Message:
  -----------
  tests: Try to make shutdowntest a bit more robust

This should help it run better on slow test environment like the LXC CI
armhf builder.
 - Wait longer for the container to start
 - Wait longer for the container to shutdown
 - On failure to shutdown, kill the container
 - Always destroy the container if it's around

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


  Commit: 93903d99748e185c35cc237d3b1b1f4cca049b93
      https://github.com/lxc/lxc/commit/93903d99748e185c35cc237d3b1b1f4cca049b93
  Author: Guillaume ZITTA <lxc at zitta.fr>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M templates/lxc-gentoo.in

  Log Message:
  -----------
  lxc-gentoo, fix lack of any generated locale

fix lack of any generated locale

Signed-off-by: Guillaume ZITTA <lxc at zitta.fr>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 685398a196451bd6b69ff9b46512d3cf1a28ea5d
      https://github.com/lxc/lxc/commit/685398a196451bd6b69ff9b46512d3cf1a28ea5d
  Author: Guillaume ZITTA <lxc at zitta.fr>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M templates/lxc-gentoo.in

  Log Message:
  -----------
  enable sshd by default like other templates

Signed-off-by: Guillaume ZITTA <lxc at zitta.fr>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 62163cb2e68767e187836db1871d8a99d63ebed2
      https://github.com/lxc/lxc/commit/62163cb2e68767e187836db1871d8a99d63ebed2
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M config/apparmor/abstractions/container-base
    M config/apparmor/container-rules
    M config/apparmor/container-rules.base
    M config/apparmor/lxc-generate-aa-rules.py

  Log Message:
  -----------
  apparmor: deny writes to most of /proc/sys (v2)

Allow writes to kernel.shm*, net.*, kernel/domainname and
kernel/hostname,

Also fix a bug in the lxc-generate-aa-rules.py script in a
path which wasn't being exercised before, which returned a
path element rather than its child.

Changelog (v2): remove trailing / from block path

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


  Commit: e0b8d53320280284677fca592644fcf39bca1017
      https://github.com/lxc/lxc/commit/e0b8d53320280284677fca592644fcf39bca1017
  Author: Dwight Engen <dwight.engen at oracle.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M src/lxc/lxc_monitord.c
    M src/lxc/monitor.c

  Log Message:
  -----------
  make monitor/monitord more resilient to unexpected termination

Reported-by: Florian Klink <flokli at flokli.de>
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: 24073c8f0ec5fca76c0ac828a0564cd67e609383
      https://github.com/lxc/lxc/commit/24073c8f0ec5fca76c0ac828a0564cd67e609383
  Author: Michael H. Warfield <mhw at WittsEnd.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M templates/lxc-centos.in
    M templates/lxc-fedora.in

  Log Message:
  -----------
  Added lxc.arch to configuration files for CentOS and Fedora

Added lxc.arch to the resulting container configuration files
to support i686 on x86_64 cross arch containers.

Signed-off-by: Michael H. Warfield <mhw at WittsEnd.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: 26d6d1c5343ea00da68735cf0705f79b2d8f5a11
      https://github.com/lxc/lxc/commit/26d6d1c5343ea00da68735cf0705f79b2d8f5a11
  Author: Dwight Engen <dwight.engen at oracle.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M src/lxc/lxc_info.c

  Log Message:
  -----------
  fix lxc-info printing duplicate lines

When lxc-info's stdout is not line buffered (ie. "lxc-info -n foo |more")
the first three lines will be duplicated. This is because c->get_ips()
comes next and it forks and the child will exit() causing its fds to be
closed which flushes out its (fork duplicated) stdio buffers. The lines are
then duplicated when the parent actually gets around to flushing out its
stdio. This causes problems for programs (such as the lxc-webpanel) which
are popen()ing lxc-info.

The fix here isn't necessarily the right one, but does show what the
problem is. Seems like maybe we should fix this inside of get_ips(), for
other API callers as well.

Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: 2979abc1fce087da0283ab9e81d29ee0e7069776
      https://github.com/lxc/lxc/commit/2979abc1fce087da0283ab9e81d29ee0e7069776
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

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

  Log Message:
  -----------
  apparmor: Update profiles for current upstream parser

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


  Commit: 5291ed9e7536a526f765b2db8432ae4bd29c0a24
      https://github.com/lxc/lxc/commit/5291ed9e7536a526f765b2db8432ae4bd29c0a24
  Author: S.Çağlar Onur <caglar at 10ur.org>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  add init.lxc to .gitignore

Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: be1d88e685bc8fd582e59a1a799bb4496dc9346b
      https://github.com/lxc/lxc/commit/be1d88e685bc8fd582e59a1a799bb4496dc9346b
  Author: Robert Vogelgesang <vogel at users.sourceforge.net>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M config/init/sysvinit/lxc

  Log Message:
  -----------
  Fix wait_for_bridge() in sysvinit script

Fix parsing of /etc/lxc/default.conf, i. e. ignore comments, and don't
require whitespace left and right of the equal sign.

Make the early return actually work.

Signed-off-by: Robert Vogelgesang <vogel at users.sourceforge.net>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: b6ac57f968a8eefcc580c86f8b94ca1ba406a674
      https://github.com/lxc/lxc/commit/b6ac57f968a8eefcc580c86f8b94ca1ba406a674
  Author: Robert Vogelgesang <vogel at users.sourceforge.net>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M src/lxc/lxc_monitord.c

  Log Message:
  -----------
  Move lxc-monitord.log out of /var/lib/lxc/

Place log file into LOGPATH instead of LXCPATH (but still use the
given lxcpath if the latter differs from LXCPATH).

Signed-off-by: Robert Vogelgesang <vogel at users.sourceforge.net>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 12cd132a2ed207c83fc90b0d7ddc90402a6a63fb
      https://github.com/lxc/lxc/commit/12cd132a2ed207c83fc90b0d7ddc90402a6a63fb
  Author: Leonid Isaev <lisaev at umail.iu.edu>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M templates/lxc-archlinux.in

  Log Message:
  -----------
  archlinux: Fix default package selection

Do not cherry-pick packages for the default install to avoid dependency
issues. Instead, install the base group modulo blacklisted packages.

Signed-off-by: Leonid Isaev <lisaev at umail.iu.edu>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 25c3f422925c1b091780d0cce5b187f152b0d7a8
      https://github.com/lxc/lxc/commit/25c3f422925c1b091780d0cce5b187f152b0d7a8
  Author: Leonid Isaev <lisaev at umail.iu.edu>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M templates/lxc-archlinux.in

  Log Message:
  -----------
  archlinux: Create per-container pacman host key

Do not copy the pacman master key from the host, as this opens it to
attacks; generate a new secret hostkey.

Signed-off-by: Leonid Isaev <lisaev at umail.iu.edu>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: e89ed2acface38ada52cb3900e26cb64cfc34fcd
      https://github.com/lxc/lxc/commit/e89ed2acface38ada52cb3900e26cb64cfc34fcd
  Author: Leonid Isaev <lisaev at umail.iu.edu>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M templates/lxc-archlinux.in

  Log Message:
  -----------
  archlinux: Code cleanups (v2)

Cleanups:
1. Do not modify container's /etc/hosts (archlinux uses /etc/nsswitch.conf)
2. Remove duplicate lines from config
3. Print a nicer final message
4. Get rid of some grep's

Signed-off-by: Leonid Isaev <lisaev at umail.iu.edu>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/02837208e88b...e89ed2acface


More information about the lxc-devel mailing list