summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-04-15 21:52:56 +0200
committerLennart Poettering <lennart@poettering.net>2013-04-15 21:59:04 +0200
commita32360f1a5a85c12f00e9dfb7353280067cccb5b (patch)
treeb393c957350f0550922eafebaba44eab49e5d6a2 /src/login
parenta53824ea7466bee2c5e6ac9a11b58b79adceb98b (diff)
core: always create /user and /machine top-level cgroup dirs
This allows clients to put inotify watches on these trees to watch for state changes, without having to wait until these dirs are created. This introduces the new top-level /machine cgroup dir as canonical location where OS containers and VMs shall be located (as discussed with the libvirt folks).
Diffstat (limited to 'src/login')
-rw-r--r--src/login/logind-session.c4
-rw-r--r--src/login/logind-user.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index e2f41d3e57..da7ce42015 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -442,9 +442,9 @@ static int session_create_one_group(Session *s, const char *controller, const ch
if (s->leader > 0) {
r = cg_create_and_attach(controller, path, s->leader);
if (r < 0)
- r = cg_create(controller, path);
+ r = cg_create(controller, path, NULL);
} else
- r = cg_create(controller, path);
+ r = cg_create(controller, path, NULL);
if (r < 0)
return r;
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 411215a925..4b0ac5e737 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -320,7 +320,7 @@ static int user_create_cgroup(User *u) {
} else
p = u->cgroup_path;
- r = cg_create(SYSTEMD_CGROUP_CONTROLLER, p);
+ r = cg_create(SYSTEMD_CGROUP_CONTROLLER, p, NULL);
if (r < 0) {
log_error("Failed to create cgroup "SYSTEMD_CGROUP_CONTROLLER":%s: %s", p, strerror(-r));
free(p);
@@ -335,7 +335,7 @@ static int user_create_cgroup(User *u) {
if (strv_contains(u->manager->reset_controllers, *k))
continue;
- r = cg_create(*k, p);
+ r = cg_create(*k, p, NULL);
if (r < 0)
log_warning("Failed to create cgroup %s:%s: %s", *k, p, strerror(-r));
}