30 lines
1020 B
Diff
30 lines
1020 B
Diff
From beefa97e5dd3daec438b6d8237af167fde1097dd Mon Sep 17 00:00:00 2001
|
|
From: LiFeng <lifeng68@huawei.com>
|
|
Date: Thu, 16 Apr 2020 12:35:45 +0800
|
|
Subject: [PATCH 40/49] cgfsng: make container full path in cgfsng_get_cgroup
|
|
|
|
Signed-off-by: LiFeng <lifeng68@huawei.com>
|
|
---
|
|
src/lxc/cgroups/cgfsng.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
|
|
index 76576c5..e2a8983 100644
|
|
--- a/src/lxc/cgroups/cgfsng.c
|
|
+++ b/src/lxc/cgroups/cgfsng.c
|
|
@@ -2612,6 +2612,11 @@ __cgfsng_ops static const char *cgfsng_get_cgroup(struct cgroup_ops *ops,
|
|
return log_warn_errno(NULL, ENOENT, "Failed to find hierarchy for controller \"%s\"",
|
|
controller ? controller : "(null)");
|
|
|
|
+#ifdef HAVE_ISULAD
|
|
+ if (!h->container_full_path)
|
|
+ h->container_full_path = must_make_path(h->mountpoint, h->container_base_path, ops->container_cgroup, NULL);
|
|
+#endif
|
|
+
|
|
return h->container_full_path
|
|
? h->container_full_path + strlen(h->mountpoint)
|
|
: NULL;
|
|
--
|
|
1.8.3.1
|
|
|