]> err.no Git - systemd/commitdiff
manager: don't place units in the 'cpu' group when run as user instance, for now
authorLennart Poettering <lennart@poettering.net>
Wed, 18 Jan 2012 14:41:21 +0000 (15:41 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 18 Jan 2012 14:41:21 +0000 (15:41 +0100)
src/manager.c

index bab16627064abbe4572c44b03bfae8d3801e1be4..19e54417221fdfeb969b5703af979fb9e5cf0cd2 100644 (file)
@@ -247,8 +247,11 @@ int manager_new(ManagerRunningAs running_as, Manager **_m) {
         if (!(m->environment = strv_copy(environ)))
                 goto fail;
 
-        if (!(m->default_controllers = strv_new("cpu", NULL)))
-                goto fail;
+        if (running_as == MANAGER_SYSTEM) {
+                m->default_controllers = strv_new("cpu", NULL);
+                if (!m->default_controllers)
+                        goto fail;
+        }
 
         if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
                 goto fail;