summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-01-18 15:41:21 +0100
committerLennart Poettering <lennart@poettering.net>2012-01-18 15:41:21 +0100
commit88f06645623467f9c8db88afca64557d62e38c61 (patch)
tree5fa4e5e921800f0a2a638452b36f1b53a758695b
parent9058851be7821edac08c1fa7ecafe5cba9ab9022 (diff)
manager: don't place units in the 'cpu' group when run as user instance, for now
-rw-r--r--src/manager.c7
1 files changed, 5 insertions, 2 deletions
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;