[lxc-devel] [lxc/lxc] 692ba1: cgroup: re-introduce ns cgroup support

GitHub noreply at github.com
Wed Sep 11 18:59:20 UTC 2013


  Branch: refs/heads/staging
  Home:   https://github.com/lxc/lxc
  Commit: 692ba18faeb83e1a92743c198484f18b4fc18bc5
      https://github.com/lxc/lxc/commit/692ba18faeb83e1a92743c198484f18b4fc18bc5
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M src/lxc/cgroup.c
    M src/lxc/cgroup.h
    M src/lxc/start.c

  Log Message:
  -----------
  cgroup: re-introduce ns cgroup support

If a cgroup hierarchy has ns cgroup composed, then we need to treat
that differently:

1. The container init will have already been switched to a new cgroup
called after its pid.
2. We can't move the container init to new deeper cgroup directories.

So, if we detect an ns cgroup, don't bother trying to construct a new
name according to the pattern.  Just rename the current one to the
container name, and save that path for us to later enter and remove.

Note I'm not dealing with the subpaths so nested containers probably
won't work.  However as ns cgroup is very much legacy, that should be
ok.  Eventually we should be able to drop ns cgroup support altogether,
but not just yet.

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


  Commit: 9e60f51d0d1d295bdd77f2fa848f3046e04e6804
      https://github.com/lxc/lxc/commit/9e60f51d0d1d295bdd77f2fa848f3046e04e6804
  Author: Dwight Engen <dwight.engen at oracle.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M src/lxc/lxc_monitord.c
    M src/lxc/lxclock.c
    M src/lxc/monitor.c
    M src/lxc/monitor.h
    M src/lxc/utils.c
    M src/lxc/utils.h

  Log Message:
  -----------
  move monitor-fifo and monitor-sock to /run

Moving these files should allow $lxcpath to be a read-only fs.

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


Compare: https://github.com/lxc/lxc/compare/c3cb8580407b...9e60f51d0d1d


More information about the lxc-devel mailing list