Skip to content

Commit

Permalink
Merge pull request #1430 from giuseppe/make-error-clearer
Browse files Browse the repository at this point in the history
cgroup: make error clearer
  • Loading branch information
flouthoc authored Mar 2, 2024
2 parents cde8f10 + 9eea9ff commit 0dbb353
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libcrun/cgroup-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ write_controller_file (const char *path, int controllers_to_enable, libcrun_erro

e = crun_error_get_errno (err);
if (e != EPERM && e != EACCES && e != EBUSY && e != ENOENT && e != EOPNOTSUPP)
return ret;
return crun_error_wrap (err, "enable controllers `%s`", controllers);

/* ENOENT can mean both that the file doesn't exist or the controller is not present. */
if (e == ENOENT)
Expand All @@ -803,7 +803,7 @@ write_controller_file (const char *path, int controllers_to_enable, libcrun_erro
{
ret = maybe_make_cgroup_threaded (path, err);
if (UNLIKELY (ret < 0))
return ret;
return crun_error_wrap (err, "make cgroup threaded");
}

/* It seems the kernel can return EBUSY when a process was moved to a sub-cgroup
Expand Down

1 comment on commit 0dbb353

@packit-as-a-service
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podman-next COPR build failed. @containers/packit-build please check.

Please sign in to comment.