summaryrefslogtreecommitdiff
path: root/src/core/swap.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/swap.c
parent4e72e29a390e0bd9226eb802d80b9a9c259565cd (diff)
core: add global settings for enabling CPUAccounting=, MemoryAccounting=, BlockIOAccounting= for all units at once
Diffstat (limited to 'src/core/swap.c')
-rw-r--r--src/core/swap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/swap.c b/src/core/swap.c
index 24c4611cbe..96cf38aae2 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -124,6 +124,8 @@ static void swap_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->parameters_proc_swaps.priority = s->parameters_fragment.priority = -1;
s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
@@ -352,7 +354,7 @@ static int swap_load(Unit *u) {
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;
}