Skip to content

Commit

Permalink
Merge pull request #3378 from brauner/2020-04-13/fixes
Browse files Browse the repository at this point in the history
cgroups: adhere to boolean return
  • Loading branch information
stgraber committed Apr 13, 2020
2 parents e1141de + ec4d463 commit ff81e0a
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/lxc/cgroups/cgfsng.c
Expand Up @@ -1194,11 +1194,9 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
* line, which is not possible once a subdirectory has been
* created.
*/
if (string_in_list(h->controllers, "devices")) {
ret = ops->setup_limits_legacy(ops, conf, true);
if (ret < 0)
return ret;
}
if (string_in_list(h->controllers, "devices") &&
!ops->setup_limits_legacy(ops, conf, true))
return log_error(false, "Failed to setup legacy device limits");
}

ret = mkdir_eexist_on_last(path, 0755);
Expand Down

0 comments on commit ff81e0a

Please sign in to comment.