From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 18 Jan 2012 14:41:21 +0000 (+0100)
Subject: manager: don't place units in the 'cpu' group when run as user instance, for now
X-Git-Tag: v39~30
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88f06645623467f9c8db88afca64557d62e38c61;p=systemd

manager: don't place units in the 'cpu' group when run as user instance, for now
---

diff --git a/src/manager.c b/src/manager.c
index bab16627..19e54417 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -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;