Skip to content

L
lxc
Commit ba3f32cf by Serge Hallyn Committed by Stéphane Graber
Options

cgm_destroy: ignore a NULL d->cgroup_path

Depending on where during container creation we failed, cgroup_path may be NULL. Don't try to delete the cgroup in that case. (Also fix a wrong function name in an ERROR message) Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 1efaeac9
Showing with 2 additions and 2 deletions
src/lxc/cgmanager.c
......@@ -438,7 +438,7 @@ static void cgm_destroy(void *hdata)
struct cgm_data *d = hdata;
int i;
if (!d)
if (!d || !d->cgroup_path)
return;
if (!cgm_dbus_connect()) {
ERROR("Error connecting to cgroup manager");
......@@ -703,7 +703,7 @@ static int cgm_do_set(const char *controller, const char *file,
if (ret != 0) {
NihError *nerr;
nerr = nih_error_get();
ERROR("call to cgmanager_remove_sync failed: %s", nerr->message);
ERROR("call to cgmanager_set_value_sync failed: %s", nerr->message);
nih_free(nerr);
ERROR("Error setting cgroup %s limit %s", file, 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