Skip to content

L
lxc
Commit 9ec45e7f by Serge Hallyn
Options

cgroups: try to load cgmanager first

If cgmanager is running, use it. This allows the admin to simply stop cgmanager if they don't want to use it. The other way there is no way to choose to use cgmanager. Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 8aa1044f
Showing with 6 additions and 3 deletions
src/lxc/cgroup.c
...@@ -46,12 +46,12 @@ void cgroup_ops_init(void) ...@@ -46,12 +46,12 @@ void cgroup_ops_init(void)
} }
DEBUG("cgroup_init"); DEBUG("cgroup_init");
ops = cgfsng_ops_init();
#if HAVE_CGMANAGER #if HAVE_CGMANAGER
if (!ops) ops = cgm_ops_init();
ops = cgm_ops_init();
#endif #endif
if (!ops) if (!ops)
ops = cgfsng_ops_init();
if (!ops)
ops = cgfs_ops_init(); ops = cgfs_ops_init();
if (ops) if (ops)
INFO("Initialized cgroup driver %s", ops->name); INFO("Initialized cgroup driver %s", ops->name);
......
src/tests/lxc-test-automount
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
[ -f /proc/self/ns/cgroup ] && exit 0 [ -f /proc/self/ns/cgroup ] && exit 0
# cgmanager doesn't do the same cgroup filesystem mounting
cgm ping && exit 0
set -ex set -ex
cleanup() { cleanup() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment