Merge pull request containers#97 from giuseppe/cgroupfs-ignore-rootle…

…ss-errors cgroup: ignore rootless errors if manager != systemd
dragonylffly · Sep 19, 2019 · 66cd22c · 66cd22c
2 parents 50eaba6 + 164e00b
commit 66cd22c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/libcrun/cgroup.c b/src/libcrun/cgroup.c
@@ -914,8 +914,12 @@ libcrun_cgroup_enter (oci_container_linux_resources *resources, int cgroup_mode,
       return ret;
     }
 
-  if (rootless > 0 && cgroup_mode != CGROUP_MODE_UNIFIED)
+  if (rootless > 0 && (cgroup_mode != CGROUP_MODE_UNIFIED || manager != CGROUP_MANAGER_SYSTEMD))
     {
+      if (cgroup_mode == CGROUP_MODE_UNIFIED && manager != CGROUP_MANAGER_SYSTEMD)
+        libcrun_warning ("cannot configure rootless cgroup using the cgroupfs manager");
+
+      /* Ignore cgroups errors and set there is no cgroup path to use.  */
       free (*path);
       *path = NULL;
       crun_error_release (err);