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: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
index 684a3c3df65638b53baf059a232ddfad30399e20..1a92ef42a3f34534d41780448e50ace2b1d4c425 100644 (file)
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -46,11 +46,11 @@ void cgroup_ops_init(void)
        }
 
        DEBUG("cgroup_init");
-       ops = cgfsng_ops_init();
        #if HAVE_CGMANAGER
-       if (!ops)
-               ops = cgm_ops_init();
+       ops = cgm_ops_init();
        #endif
+       if (!ops)
+               ops = cgfsng_ops_init();
        if (!ops)
                ops = cgfs_ops_init();
        if (ops)

diff --git a/src/tests/lxc-test-automount b/src/tests/lxc-test-automount
index 6a06d7acdbec68ea09688d2a2412c785d4b8e67f..450537537c248d7d7189b714404080967154c357 100644 (file)
--- a/src/tests/lxc-test-automount
+++ b/src/tests/lxc-test-automount
@@ -24,6 +24,9 @@
 
 [ -f /proc/self/ns/cgroup ] && exit 0
 
+# cgmanager doesn't do the same cgroup filesystem mounting
+cgm ping && exit 0
+
 set -ex
 
 cleanup() {