summaryrefslogtreecommitdiff
path: root/src/core/socket.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-24 23:50:10 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-24 23:50:10 +0100
commit085afe36cb823e7d5b8c5f3ef21ebb9639bac78b (patch)
tree25b26a8b92d8562983b22098d0dfe5777efc8927 /src/core/socket.c
parent4e72e29a390e0bd9226eb802d80b9a9c259565cd (diff)
core: add global settings for enabling CPUAccounting=, MemoryAccounting=, BlockIOAccounting= for all units at once
Diffstat (limited to 'src/core/socket.c')
-rw-r--r--src/core/socket.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/socket.c b/src/core/socket.c
index 0ccda2fe3c..8e39032db6 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -96,6 +96,8 @@ static void socket_init(Unit *u) {
kill_context_init(&s->kill_context);
cgroup_context_init(&s->cgroup_context);
+ unit_cgroup_context_init_defaults(u, &s->cgroup_context);
+
s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
}
@@ -338,7 +340,7 @@ static int socket_add_extras(Socket *s) {
if (r < 0)
return r;
- r = unit_exec_context_defaults(u, &s->exec_context);
+ r = unit_exec_context_patch_defaults(u, &s->exec_context);
if (r < 0)
return r;