summaryrefslogtreecommitdiff
path: root/src/core/mount.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/mount.c
parent4e72e29a390e0bd9226eb802d80b9a9c259565cd (diff)
core: add global settings for enabling CPUAccounting=, MemoryAccounting=, BlockIOAccounting= for all units at once
Diffstat (limited to 'src/core/mount.c')
-rw-r--r--src/core/mount.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/mount.c b/src/core/mount.c
index a0cea1e7d4..814674a02d 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -141,6 +141,8 @@ static void mount_init(Unit *u) {
kill_context_init(&m->kill_context);
cgroup_context_init(&m->cgroup_context);
+ unit_cgroup_context_init_defaults(u, &m->cgroup_context);
+
if (unit_has_name(u, "-.mount")) {
/* Don't allow start/stop for root directory */
u->refuse_manual_start = true;
@@ -577,7 +579,7 @@ static int mount_add_extras(Mount *m) {
if (r < 0)
return r;
- r = unit_exec_context_defaults(u, &m->exec_context);
+ r = unit_exec_context_patch_defaults(u, &m->exec_context);
if (r < 0)
return r;