X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fcgroup-label.c;h=bae0a627d24293cf785446f197632cd7a8c43b6a;hp=995e4c57cd4fa3f745b0dafa6e6d155c039e6222;hb=7991ac34ab08421415b907e42775c5539a4a5bbb;hpb=974efc46586854b1f23ccf153b36199c77919de6

diff --git a/src/shared/cgroup-label.c b/src/shared/cgroup-label.c
index 995e4c57c..bae0a627d 100644
--- a/src/shared/cgroup-label.c
+++ b/src/shared/cgroup-label.c
@@ -36,18 +36,18 @@
 #include "util.h"
 #include "mkdir.h"
 
+/* This is split out since it needs label calls, either directly or
+ * indirectly. */
+
 int cg_create(const char *controller, const char *path) {
         _cleanup_free_ char *fs = NULL;
         int r;
 
-        assert(controller);
-        assert(path);
-
         r = cg_get_path_and_check(controller, path, NULL, &fs);
         if (r < 0)
                 return r;
 
-        r = mkdir_parents_label(fs, 0755);
+        r = mkdir_parents_prefix_label("/sys/fs/cgroup", fs, 0755);
         if (r < 0)
                 return r;
 
@@ -65,8 +65,6 @@ int cg_create(const char *controller, const char *path) {
 int cg_create_and_attach(const char *controller, const char *path, pid_t pid) {
         int r, q;
 
-        assert(controller);
-        assert(path);
         assert(pid >= 0);
 
         r = cg_create(controller, path);