From: Christian Brauner Date: Wed, 10 Feb 2021 12:03:06 +0000 (+0100) Subject: criu: warn about cgroup hierarchies without controllers X-Git-Tag: lxc-5.0.0~294^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92fde26d7b9c9fc15c793282310c3bec0938e3ce;p=thirdparty%2Flxc.git criu: warn about cgroup hierarchies without controllers Signed-off-by: Christian Brauner --- diff --git a/src/lxc/criu.c b/src/lxc/criu.c index c5d70aa22..e934f9e27 100644 --- a/src/lxc/criu.c +++ b/src/lxc/criu.c @@ -324,11 +324,16 @@ static int exec_criu(struct cgroup_ops *cgroup_ops, struct lxc_conf *conf, return log_error_errno(-ENOMEM, ENOMEM, "Failed to remove extraneous slashes from \"%s\"", tmp); free_move_ptr(cgroup_base_path, tmp); - controllers = lxc_string_join(",", (const char **)controllers_list, false); - if (!controllers) - return log_error_errno(-ENOMEM, ENOMEM, "Failed to join controllers"); + if (controllers_list[0]) { + controllers = lxc_string_join(",", (const char **)controllers_list, false); + if (!controllers) + return log_error_errno(-ENOMEM, ENOMEM, "Failed to join controllers"); - ret = sprintf(buf, "%s:%s", controllers, cgroup_base_path); + ret = sprintf(buf, "%s:%s", controllers, cgroup_base_path); + } else { + WARN("No cgroup controllers configured in container's cgroup %s", cgroup_base_path); + ret = sprintf(buf, "%s", cgroup_base_path); + } if (ret < 0 || ret >= sizeof(buf)) return log_error_errno(-EIO, EIO, "sprintf of cgroup root arg failed");