[lxc-devel] [lxc/lxc] 06ce39: doc: Add lxc.ephemeral in Korean lxc.container.con...

Thu Oct 29 21:59:06 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 06ce39213216861ac882960f4b25393414119f9e
      https://github.com/lxc/lxc/commit/06ce39213216861ac882960f4b25393414119f9e
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

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

  Log Message:
  -----------
  doc: Add lxc.ephemeral in Korean lxc.container.conf(5)

Update for commit 4e6eb26

Signed-off-by: Sungbae Yoo <sungbae.yoo at samsung.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: d0b2a43477227f36c1415d1403596d17490fad8a
      https://github.com/lxc/lxc/commit/d0b2a43477227f36c1415d1403596d17490fad8a
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

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

  Log Message:
  -----------
  doc: Add the description of lxc.hook.stop to Japanese lxc.container.conf(5)

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 0a2dddd479a815fbbca427c5b5418a303c0b1c1f
      https://github.com/lxc/lxc/commit/0a2dddd479a815fbbca427c5b5418a303c0b1c1f
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Make mount_entry_create_*_dirs() more robust

The mount_entry_create_*_dirs() functions currently assume that the rootfs of
the container is actually named "rootfs". This has the consequence that

	del = strstr(lxcpath, "/rootfs");
	if (!del) {
		free(lxcpath);
		lxc_free_array((void **)opts, free);
		return -1;
	}
	*del = '\0';

will return NULL when the rootfs of a container is not actually named "rootfs".
This means the we return -1 and do not create the necessary upperdir/workdir
directories required for the overlay/aufs mount to work. Hence, let's not make
that assumption. We now pass lxc_path and lxc_name to
mount_entry_create_*_dirs() and create the path directly. To prevent failure we
also have mount_entry_create_*_dirs() check that lxc_name and lxc_path are not
empty when they are passed in.

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

  Commit: 27c278a76931bfc4660caa85d1942ca91c86e0bf
      https://github.com/lxc/lxc/commit/27c278a76931bfc4660caa85d1942ca91c86e0bf
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M templates/lxc-ubuntu-cloud.in

  Log Message:
  -----------
  ubuntu-cloud: Replace .tar.gz by .tar.xz and don't auto-generate missing tarballs

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

  Commit: f348e47c93568b4f0c371cf5df1c98d4e816a86c
      https://github.com/lxc/lxc/commit/f348e47c93568b4f0c371cf5df1c98d4e816a86c
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M src/lxc/cgfs.c
    M src/lxc/cgmanager.c
    M src/lxc/cgroup.c
    M src/lxc/cgroup.h

  Log Message:
  -----------
  Ignore trailing /init.scope in init cgroups

The lxc monitor does not store the container's cgroups, rather it
recalculates them whenever needed.

Systemd moves itself into a /init.scope cgroup for the systemd
controller.

It might be worth changing that (by storing all cgroup info in the
lxc_handler), but for now go the hacky route and chop off any
trailing /init.scope.

I definately thinkg we want to switch to storing as that will be
more bullet-proof, but for now we need a quick backportable fix
for systemd 226 guests.

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

  Commit: b5f4bc783f5f19d6de61dfa37fa57e13a4f2ac12
      https://github.com/lxc/lxc/commit/b5f4bc783f5f19d6de61dfa37fa57e13a4f2ac12
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M src/lxc/lxc_usernsexec.c

  Log Message:
  -----------
  lxc-usernsexec: reopen fds 0,1,2 separately

lxc-usernsexec was using fd 0 and reopening it as 0,1,2 for
the new task.  If doing "lxc-usernsexec .. < script" this
will corrupt the file 'script'.

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

  Commit: 4ed565e51a4f016ecd6765251a318087a91fe534
      https://github.com/lxc/lxc/commit/4ed565e51a4f016ecd6765251a318087a91fe534
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

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

  Log Message:
  -----------
  lxc-net: switch After target to network-online.target

Otherwise it may start too early and end up taking 10.0.3.1 even
though eth0 was eventually going to end up on 10.0.3.x.

https://bugs.launchpad.net/juju-core/+bug/1510619

Reported-by: Ryan Harper <ryan.harper at ubuntu.com>
Cc: Martin Pitt <martin.pitt at ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 1e3ce0da4978011f55fbc5d25ab7f7d055618757
      https://github.com/lxc/lxc/commit/1e3ce0da4978011f55fbc5d25ab7f7d055618757
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Parse rootfs->path

The mount_entry_overlay_dirs() and mount_entry_aufs_dirs() functions create
workdirs and upperdirs for overlay and aufs lxc.mount.entry entries. They try
to make sure that the workdirs and upperdirs can only be created under the
containerdir (e.g. /path/to/the/container/CONTAINERNAME). In order to do this
the right hand side of
           if ((strncmp(upperdir, lxcpath, dirlen) == 0) && (strncmp(upperdir, rootfs->path, rootfslen) != 0))

was thought to check if the rootfs->path is not present in the workdir and
upperdir mount options. But the current check is bogus since it will be
trivially true whenever the container is a block-dev or overlay or aufs backed
since the rootfs->path will then have a form like e.g.
   overlayfs:/some/path:/some/other/path

This patch adds the function ovl_get_rootfs_dir() which parses rootfs->path by
searching backwards for the first occurrence of the delimiter pair ":/". We do
not simply search for ":" since it might be used in path names. If ":/" is not
found we assume the container is directory backed and simply return
strdup(rootfs->path).

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

  Commit: 9e5a2a015a2336a155637a64603678b34695c510
      https://github.com/lxc/lxc/commit/9e5a2a015a2336a155637a64603678b34695c510
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Simplify function

Instead of duplicating the cleanup-code, once for success and once for failure,
simply keep a variable fret which is -1 in the beginning and gets set to 0 on
success or stays -1 on failure.

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

Compare: https://github.com/lxc/lxc/compare/e963273a7791...9e5a2a015a23