s->socket_fd = -1;
s->guess_main_pid = true;
- exec_context_init(&s->exec_context);
- kill_context_init(&s->kill_context);
- cgroup_context_init(&s->cgroup_context);
-
- unit_cgroup_context_init_defaults(u, &s->cgroup_context);
-
RATELIMIT_INIT(s->start_limit, u->manager->default_start_limit_interval, u->manager->default_start_limit_burst);
s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID;
free(s->status_text);
s->status_text = NULL;
- cgroup_context_done(&s->cgroup_context);
- exec_context_done(&s->exec_context);
s->exec_runtime = exec_runtime_unref(s->exec_runtime);
exec_command_free_array(s->exec_command, _SERVICE_EXEC_COMMAND_MAX);
s->control_command = NULL;
service_fix_output(s);
+ r = unit_patch_contexts(u);
+ if (r < 0)
+ return r;
+
r = unit_add_exec_dependencies(u, &s->exec_context);
if (r < 0)
return r;
- r = unit_add_default_slice(u);
+ r = unit_add_default_slice(u, &s->cgroup_context);
if (r < 0)
return r;
return r;
#endif
- if (s->bus_name) {
- r = unit_watch_bus_name(u, s->bus_name);
- if (r < 0)
- return r;
- }
-
if (s->type == SERVICE_NOTIFY && s->notify_access == NOTIFY_NONE)
s->notify_access = NOTIFY_MAIN;
if (s->watchdog_usec > 0 && s->notify_access == NOTIFY_NONE)
s->notify_access = NOTIFY_MAIN;
- if (UNIT(s)->default_dependencies) {
- r = service_add_default_dependencies(s);
+ if (s->bus_name) {
+ r = unit_watch_bus_name(u, s->bus_name);
if (r < 0)
return r;
}
- r = unit_exec_context_patch_defaults(u, &s->exec_context);
- if (r < 0)
- return r;
+ if (u->default_dependencies) {
+ r = service_add_default_dependencies(s);
+ if (r < 0)
+ return r;
+ }
}
return service_verify(s);