X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcgroup.c;h=ca19a4fd4768ef55910e64f5337e0184402d6ab3;hp=5864858dd7e7099011aebcc48ed1b128e18ab1f2;hb=9534ce54858c67363b841cdbdc315140437bfdb4;hpb=12235040ec94279ad92693dcfae0a4d9c35a6076

diff --git a/src/cgroup.c b/src/cgroup.c
index 5864858dd..ca19a4fd4 100644
--- a/src/cgroup.c
+++ b/src/cgroup.c
@@ -225,6 +225,12 @@ int manager_setup_cgroup(Manager *m) {
 
         assert(m);
 
+        /* 0. Be nice to Ingo Molnar #628004 */
+        if (path_is_mount_point("/sys/fs/cgroup/systemd") <= 0) {
+                log_warning("No control group support available, not creating root group.");
+                return 0;
+        }
+
         /* 1. Determine hierarchy */
         if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &current)) < 0) {
                 log_error("Cannot determine cgroup we are running in: %s", strerror(-r));