Skip to content

L
lxc
Unverified Commit 9b30530b by Christian Brauner
Options

cgroups: fix fallback attach codepath

When we attach to an old server the server can return ENOSYS instead of ENOCGROUP2 which causes LXC to abort the attach unnecessary. Fix this! Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 88bc42b4
Showing with 1 addition and 1 deletion
src/lxc/cgroups/cgfsng.c
...@@ -2293,7 +2293,7 @@ static int __cg_unified_attach(const struct hierarchy *h, ...@@ -2293,7 +2293,7 @@ static int __cg_unified_attach(const struct hierarchy *h,
ret = cgroup_attach(conf, name, lxcpath, pid); ret = cgroup_attach(conf, name, lxcpath, pid);
if (ret == 0) if (ret == 0)
return log_trace(0, "Attached to unified cgroup via command handler"); return log_trace(0, "Attached to unified cgroup via command handler");
if (ret != -ENOCGROUP2) if (!ERRNO_IS_NOT_SUPPORTED(ret) && ret != -ENOCGROUP2)
return log_error_errno(ret, errno, "Failed to attach to unified cgroup"); return log_error_errno(ret, errno, "Failed to attach to unified cgroup");
/* Fall back to retrieving the path for the unified cgroup. */ /* Fall back to retrieving the path for the unified cgroup. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment