chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conf-parser: warn if an assignment is place outside of a section
[elogind.git]
/
src
/
manager.c
diff --git
a/src/manager.c
b/src/manager.c
index bab16627064abbe4572c44b03bfae8d3801e1be4..74bd740747800217ec2911d6be0c8e903753514b 100644
(file)
--- 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->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;
if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
goto fail;
@@
-2940,7
+2943,7
@@
bool manager_is_booting_or_shutting_down(Manager *m) {
assert(m);
/* Is the initial job still around? */
assert(m);
/* Is the initial job still around? */
- if (manager_get_job(m,
1
))
+ if (manager_get_job(m,
m->default_unit_job_id
))
return true;
/* Is there a job for the shutdown target? */
return true;
/* Is there a job for the shutdown target? */