Merge pull request #1504 from Blub/limits-fixup

start: fix error handling when limits fail to apply
This commit is contained in:
Christian Brauner 2017-04-11 17:10:57 +02:00 committed by GitHub
commit 421a42bfe3

View File

@ -1263,7 +1263,7 @@ static int lxc_spawn(struct lxc_handler *handler)
if (!lxc_list_empty(&handler->conf->limits) && setup_resource_limits(&handler->conf->limits, handler->pid)) { if (!lxc_list_empty(&handler->conf->limits) && setup_resource_limits(&handler->conf->limits, handler->pid)) {
ERROR("failed to setup resource limits for '%s'", name); ERROR("failed to setup resource limits for '%s'", name);
return -1; goto out_delete_net;
} }
if (!cgroup_setup_limits(handler, true)) { if (!cgroup_setup_limits(handler, true)) {