[lxc-devel] [lxc/lxc] 38005c: doc: clarify the description of the veth network t...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 38005c5436d8a929141b7e8c0314dc5fd1c403f1
      https://github.com/lxc/lxc/commit/38005c5436d8a929141b7e8c0314dc5fd1c403f1
  Author: Michael Adam <obnox at samba.org>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

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

  Log Message:
  -----------
  doc: clarify the description of the veth network type in the  manpage.

Signed-off-by: Michael Adam <obnox at samba.org>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 4799a1e7eced77ae8ef48579b81aa71127958a61
      https://github.com/lxc/lxc/commit/4799a1e7eced77ae8ef48579b81aa71127958a61
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M src/lxc/lxc-start-ephemeral.in

  Log Message:
  -----------
  lxc-start-ephemeral: handle the overlayfs workdir option (v2)

We fixed this some time ago for basic lxc-start, but never did
lxc-start-ephemeral.

Since the lxc-start patches were pushed, Miklos has given us a
way to detect whether we need the workdir= option.  So the
bdev.c code could be simplified to check for "overlay\n" in
/proc/filesystems just as lxc-start-ephemeral does.  This
patch doesn't do that.

Changelog (v2):
	1. use 'overlay' fstype for new overlay upstream module
	2. avoid using unneeded readlines().

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


  Commit: d2cf4c378588cc1d497fe8b2ba3f835d6b03fe38
      https://github.com/lxc/lxc/commit/d2cf4c378588cc1d497fe8b2ba3f835d6b03fe38
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M src/lxc/execute.c
    M src/lxc/lxccontainer.c
    M src/lxc/monitor.c
    M src/lxc/start.c
    M src/lxc/start.h

  Log Message:
  -----------
  close-all-fds: fix behavior

We want to close all inherited fds in three cases - one, if a container
is daemonized.  Two, if the user specifies -C on the lxc-start command
line.  Three, in src/lxc/monitor.c.  The presence of -C is passed in the
lxc_conf may not always exist.

One call to lxc_check_inherited was being done from lxc_start(), which
doesn't know whether we are daemonized.  Move that call to its caller,
lxcapi_start(), which does know.

Pass an explicit closeall boolean as second argument to lxc_check_inherited.
If it is true, then all fds are closed.  If it is false, then we check
the lxc_conf->close_all_fds.

With this, all tests pass, and the logic appears correct.

Note that when -C is not true, then we only warn about inherited fds,
but we do not abort the container start.  This appears to have ben the case
since commit 92c7f6295518 in 2011.  Unfortunately the referenced URL with
the justification is no longer valid.  We may want to consider becoming
stricter about this again.  (Note that the commit did say "for now")

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/db2930e17441...d2cf4c378588