[lxc-devel] [lxc/lxc] 6318c8: Centralize hook names

Serge Hallyn noreply at github.com
Tue Jun 18 19:14:20 UTC 2019


  Branch: refs/heads/stable-3.0
  Home:   https://github.com/lxc/lxc
  Commit: 6318c827a5ab2e37d849b6d356eeec432f8fa29a
      https://github.com/lxc/lxc/commit/6318c827a5ab2e37d849b6d356eeec432f8fa29a
  Author: Rachid Koucha <47061324+Rachid-Koucha at users.noreply.github.com>
  Date:   2019-06-18 (Tue, 18 Jun 2019)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Centralize hook names

The hook string names must not be repeated in the source code to facilitate future changes

Signed-off-by: Rachid Koucha <rachid.koucha at gmail.com>


  Commit: 5edfbc68b7476cfef7dc36356c5628f83480a6c0
      https://github.com/lxc/lxc/commit/5edfbc68b7476cfef7dc36356c5628f83480a6c0
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2019-06-18 (Tue, 18 Jun 2019)

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

  Log Message:
  -----------
  doc: add a note about shared ns + LSMs to Japanese doc

Update for commit 8de90384363fe01f5258d36724dd3eae55918b5b

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>


  Commit: 505af6af91fa93af27e5990a9cc4ea5b417f7811
      https://github.com/lxc/lxc/commit/505af6af91fa93af27e5990a9cc4ea5b417f7811
  Author: Serge Hallyn <shallyn at cisco.com>
  Date:   2019-06-18 (Tue, 18 Jun 2019)

  Changed paths:
    M configure.ac
    M src/lxc/Makefile.am
    M src/lxc/lxccontainer.c
    M src/lxc/utils.c
    M src/lxc/utils.h

  Log Message:
  -----------
  Switch from gnutls to openssl for sha1

The reason for this is because openssl can be statically linked
against, gnutls cannot.

Signed-off-by: Serge Hallyn <shallyn at cisco.com>


  Commit: 5a631a2f626dca8d0f41dcec22b455c33801f224
      https://github.com/lxc/lxc/commit/5a631a2f626dca8d0f41dcec22b455c33801f224
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2019-06-18 (Tue, 18 Jun 2019)

  Changed paths:
    M src/lxc/network.c

  Log Message:
  -----------
  network: fix lxc_netdev_rename_by_index()

Return an error code when the name is invalid instead of pretending that things
are fine.

Closes #3044.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: d8337fde01968a010dba941f799dad9ac842b665
      https://github.com/lxc/lxc/commit/d8337fde01968a010dba941f799dad9ac842b665
  Author: Rachid Koucha <47061324+Rachid-Koucha at users.noreply.github.com>
  Date:   2019-06-18 (Tue, 18 Jun 2019)

  Changed paths:
    M src/lxc/start.c

  Log Message:
  -----------
  Fixed file descriptor leak for network namespace

In privileged mode, the container startup looses a file descriptor for "handler->nsfd[LX_NS_NET]". At line 1782, we preserve the namespaces file descriptor (in privileged mode, the network namespace is also preserved) :
	for (i = 0; i < LXC_NS_MAX; i++)
		if (handler->ns_on_clone_flags & ns_info[i].clone_flag)
			INFO("Cloned %s", ns_info[i].flag_name);

	if (!lxc_try_preserve_namespaces(handler, handler->ns_on_clone_flags, handler->pid)) {
		ERROR("Failed to preserve cloned namespaces for lxc.hook.stop");
		goto out_delete_net;
	}

Then at line 1830, we preserve one more time the network namespace :
		ret = lxc_try_preserve_ns(handler->pid, "net");
		if (ret < 0) {
			if (ret != -EOPNOTSUPP) {
				SYSERROR("Failed to preserve net namespace");
				goto out_delete_net;
			}
The latter overwrites the file descriptor already stored in handler->nsfd[LXC_NS_NET] at line 1786.

So, this fix checks that the entry is not already filled.

Signed-off-by: Rachid Koucha <rachid.koucha at gmail.com>


  Commit: a8c9620f942c95832762a8232780d1793616b52d
      https://github.com/lxc/lxc/commit/a8c9620f942c95832762a8232780d1793616b52d
  Author: Serge Hallyn <shallyn at cisco.com>
  Date:   2019-06-18 (Tue, 18 Jun 2019)

  Changed paths:
    M lxc.pc.in

  Log Message:
  -----------
  lxc.pc.in: add libs.private for static linking

None of them seem to support pkg-config themselves, else we could add
them to Requires.private.

Signed-off-by: Serge Hallyn <shallyn at cisco.com>


Compare: https://github.com/lxc/lxc/compare/0847afdf8bea...a8c9620f942c


More information about the lxc-devel mailing list