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).

2 files changed, 4 insertions, 4 deletions

diff --git a/src/shared/cgroup-label.c b/src/shared/cgroup-label.c
index 995e4c57cd..a0b486e51e 100644
--- a/src/shared/cgroup-label.c
+++ b/src/shared/cgroup-label.c
@@ -36,14 +36,14 @@
 #include "util.h"
 #include "mkdir.h"
 
-int cg_create(const char *controller, const char *path) {
+int cg_create(const char *controller, const char *path, const char *suffix) {
         _cleanup_free_ char *fs = NULL;
         int r;
 
         assert(controller);
         assert(path);
 
-        r = cg_get_path_and_check(controller, path, NULL, &fs);
+        r = cg_get_path_and_check(controller, path, suffix, &fs);
         if (r < 0)
                 return r;
 
@@ -69,7 +69,7 @@ int cg_create_and_attach(const char *controller, const char *path, pid_t pid) {
         assert(path);
         assert(pid >= 0);
 
-        r = cg_create(controller, path);
+        r = cg_create(controller, path, NULL);
         if (r < 0)
                 return r;
 
diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h
index 123f72c69f..274380aa2d 100644
--- a/src/shared/cgroup-util.h
+++ b/src/shared/cgroup-util.h
@@ -55,7 +55,7 @@ int cg_trim(const char *controller, const char *path, bool delete_root);
 int cg_rmdir(const char *controller, const char *path, bool honour_sticky);
 int cg_delete(const char *controller, const char *path);
 
-int cg_create(const char *controller, const char *path);
+int cg_create(const char *controller, const char *path, const char *suffix);
 int cg_attach(const char *controller, const char *path, pid_t pid);
 int cg_create_and_attach(const char *controller, const char *path, pid_t pid);