From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 29 Aug 2019 12:05:17 +0000 (+0200)
Subject: cgroups: initialize cgroup root directory - encore
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63753e8da0755efc195335971f7688ec1d9b812b;p=thirdparty%2Flxc.git

cgroups: initialize cgroup root directory - encore

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 59098ca3f..7921926d4 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1795,8 +1795,8 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 	else if (type == LXC_AUTO_CGROUP_FULL_NOSPEC)
 		type = LXC_AUTO_CGROUP_FULL_MIXED;
 
+	cgroup_root = must_make_path(root, "/sys/fs/cgroup", NULL);
 	if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) {
-		cgroup_root = must_make_path(root, "/sys/fs/cgroup", NULL);
 		if (has_cgns && wants_force_mount) {
 			/* If cgroup namespaces are supported but the container
 			 * will not have CAP_SYS_ADMIN after it has started we