[lxc-devel] [lxc/lxc] 4a3110: lxc-ubuntu-cloud: Never exit 0 when no container i...

Fri Nov 6 18:28:30 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 4a3110456051b5b018a73507ba4f56adb81006ee
      https://github.com/lxc/lxc/commit/4a3110456051b5b018a73507ba4f56adb81006ee
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

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

  Log Message:
  -----------
  lxc-ubuntu-cloud: Never exit 0 when no container is created

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

  Commit: 120146b993a576617d785ebb52157bb00d2e91a4
      https://github.com/lxc/lxc/commit/120146b993a576617d785ebb52157bb00d2e91a4
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Init error_num to 1

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

  Commit: 5d1df05bd5d70793bbd9bafc47aad1bdf5653900
      https://github.com/lxc/lxc/commit/5d1df05bd5d70793bbd9bafc47aad1bdf5653900
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M src/lxc/lxc_usernsexec.c

  Log Message:
  -----------
  only re-open fds if stdin is a tty

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

  Commit: 756f0ae856fa714f731d3935ed3daa409a31db85
      https://github.com/lxc/lxc/commit/756f0ae856fa714f731d3935ed3daa409a31db85
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

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

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

Update for commit 0a2b5ab

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

  Commit: 4ff8fb6cae48bc4cd376fffa70c69a7cd72425bc
      https://github.com/lxc/lxc/commit/4ff8fb6cae48bc4cd376fffa70c69a7cd72425bc
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M doc/ko/lxc-attach.sgml.in
    M doc/ko/lxc-autostart.sgml.in
    M doc/ko/lxc-create.sgml.in
    M doc/ko/lxc-ls.sgml.in
    M doc/ko/lxc-snapshot.sgml.in
    M doc/ko/lxc-start.sgml.in
    M doc/ko/lxc-user-nic.sgml.in
    M doc/ko/lxc.sgml.in

  Log Message:
  -----------
  Unify the polite word style in Korean manpages

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

  Commit: fd51a89b60d06f1f207196e5fe6e8e8f7bea3beb
      https://github.com/lxc/lxc/commit/fd51a89b60d06f1f207196e5fe6e8e8f7bea3beb
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  support arguments in lxc.init_cmd

Otherwise something like
	lxc.init_cmd = /sbin/init debug verbose
fails trying to execute a file called "/sbin/init debug verbose"

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

  Commit: 16d08ae7e3897391ca8e2500deaebcf021d5499a
      https://github.com/lxc/lxc/commit/16d08ae7e3897391ca8e2500deaebcf021d5499a
  Author: Wolfgang Bumiller <w.bumiller at proxmox.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M configure.ac
    M hooks/Makefile.am

  Log Message:
  -----------
  hooks: put binary hooks into $libexecdir/lxc/hooks

Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 329b36256a83bbe9b75d6b9eeb2a399628d92403
      https://github.com/lxc/lxc/commit/329b36256a83bbe9b75d6b9eeb2a399628d92403
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

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

  Log Message:
  -----------
  Add clone_update_unexp_ovl_paths() function

This functions updates absolute paths for overlay upper- and workdirs so users
can simply clone and start new containers without worrying about absolute paths
in lxc.mount.entry overlay entries.

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

  Commit: 030ce9a9656c08eb0ba5b469132437874215bed4
      https://github.com/lxc/lxc/commit/030ce9a9656c08eb0ba5b469132437874215bed4
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Update absolute paths for overlay and aufs mounts

When using overlay and aufs mounts with lxc.mount.entry users have to specify
absolute paths for upperdir and workdir which will then get created
automatically by mount_entry_create_overlay_dirs() and
mount_entry_create_aufs_dirs() in conf.c. When we clone a container with
overlay or aufs lxc.mount.entry entries we need to update these absolute paths.
In order to do this we add the function update_ovl_paths() in
lxccontainer.c. The function updates the mounts in two locations:
   1) lxc_conf->mount_list

and
   2) lxc_conf->unexpanded_config (by calling clone_update_unexp_ovl_dir())

If we were to only update 2) we would end up with wrong upperdir and workdir
mounts as the absolute paths would still point to the container that serves as
the base for the clone. If we were to only update 1) we would end up with wrong
upperdir and workdir lxc.mount.entry entries in the clone's config as the
absolute paths in upperdir and workdir would still point to the container that
serves as the base for the clone. Updating both will get the job done.

NOTE: This function does not sanitize paths apart from removing trailing
slashes. (So when a user specifies //home//someone/// it will be cleaned to
//home//someone. This is the minimal path cleansing which is also done by
lxc_container_new().) But the mount_entry_create_overlay_dirs() and
mount_entry_create_aufs_dirs() functions both try to be extremely strict about
when to create upperdirs and workdirs. They will only accept sanitized paths,
i.e. they require /home/someone. I think this is a (safety) virtue and we
should consider sanitizing paths in general. In short: update_ovl_paths() does
update all absolute paths to the new container but
mount_entry_create_overlay_dirs() and mount_entry_create_aufs_dirs() will still
refuse to create upperdir and workdir when the updated path is unclean. This
happens easily when e.g. a user calls lxc-clone -o OLD -n NEW -P
//home//chb///.

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

  Commit: d546aa0e7ebcb93ed3e17781c3803be33b8fbc8e
      https://github.com/lxc/lxc/commit/d546aa0e7ebcb93ed3e17781c3803be33b8fbc8e
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M src/lxc/confile.c

  Log Message:
  -----------
  Fix calculations in clone_update_unexp_hooks()

Changes v3:
(1) Fix typo (q --> p).

(1) This commit fixes the calculations when updating paths in lxc.hooks.*
    entries. We now also update conf->unexpandend_alloced which hasn't been
done prior to this commit.

(2) Also we use the stricter check:

    	if (p >= lend)
    		continue;

    This should deal better with invalid config files.

(3) Insert some spaces between operators to increase readability.

(4) Use gotos to simplify function and increase readability.

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

Compare: https://github.com/lxc/lxc/compare/208a29f10c08...d546aa0e7ebc