summaryrefslogtreecommitdiff
path: root/src/logind-session.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-06-29 01:47:55 +0200
committerLennart Poettering <lennart@poettering.net>2011-06-29 01:47:55 +0200
commit193197e85ccc5622abd9653dcd939712334d3ea3 (patch)
tree369f6a532af4c54ed653faf036a2e010c6c703b5 /src/logind-session.c
parent932e3ee76ea0a9d28902f694ad1873e37532da35 (diff)
logind: parse configuration file
Diffstat (limited to 'src/logind-session.c')
-rw-r--r--src/logind-session.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/logind-session.c b/src/logind-session.c
index 7671850003..088e956bfc 100644
--- a/src/logind-session.c
+++ b/src/logind-session.c
@@ -473,6 +473,7 @@ static int session_create_cgroup(Session *s) {
STRV_FOREACH(k, s->manager->controllers) {
if (strv_contains(s->reset_controllers, *k) ||
+ strv_contains(s->manager->reset_controllers, *k) ||
strv_contains(s->controllers, *k))
continue;
@@ -489,6 +490,18 @@ static int session_create_cgroup(Session *s) {
log_warning("Failed to reset controller %s: %s", *k, strerror(-r));
}
+
+ STRV_FOREACH(k, s->manager->reset_controllers) {
+
+ if (strv_contains(s->reset_controllers, *k) ||
+ strv_contains(s->controllers, *k))
+ continue;
+
+ r = cg_attach(*k, "/", s->leader);
+ if (r < 0)
+ log_warning("Failed to reset controller %s: %s", *k, strerror(-r));
+
+ }
}
hashmap_put(s->manager->cgroups, s->cgroup_path, s);