chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: rework context initialization/destruction logic
[elogind.git]
/
src
/
core
/
scope.c
diff --git
a/src/core/scope.c
b/src/core/scope.c
index be2a6370239f0762c327dcb6606100602c019d05..aa4978de4c8e28a1257a9df2d63e24ddae033d67 100644
(file)
--- a/
src/core/scope.c
+++ b/
src/core/scope.c
@@
-51,11
+51,6
@@
static void scope_init(Unit *u) {
s->timeout_stop_usec = u->manager->default_timeout_stop_usec;
s->timeout_stop_usec = u->manager->default_timeout_stop_usec;
- cgroup_context_init(&s->cgroup_context);
- kill_context_init(&s->kill_context);
-
- unit_cgroup_context_init_defaults(u, &s->cgroup_context);
-
UNIT(s)->ignore_on_isolate = true;
UNIT(s)->ignore_on_snapshot = true;
}
UNIT(s)->ignore_on_isolate = true;
UNIT(s)->ignore_on_snapshot = true;
}
@@
-65,8
+60,6
@@
static void scope_done(Unit *u) {
assert(u);
assert(u);
- cgroup_context_done(&s->cgroup_context);
-
free(s->controller);
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
free(s->controller);
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
@@
-158,7
+151,11
@@
static int scope_load(Unit *u) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = unit_add_default_slice(u);
+ r = unit_patch_contexts(u);
+ if (r < 0)
+ return r;
+
+ r = unit_add_default_slice(u, &s->cgroup_context);
if (r < 0)
return r;
if (r < 0)
return r;