proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-16 20:34:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cgm_destroy: ignore a NULL d->cgroup_path

Browse Source 
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: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2014-03-10 11:59:08 -05:00 committed by Stéphane Graber
parent 1efaeac9ae
commit ba3f32cf15
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/cgmanager.c
View File

@ -438,7 +438,7 @@ static void cgm_destroy(void *hdata)
struct cgm_data *d = hdata; struct cgm_data *d = hdata;
int i; int i;
if (!d) if (!d || !d->cgroup_path)
return; return;
if (!cgm_dbus_connect()) { if (!cgm_dbus_connect()) {
ERROR("Error connecting to cgroup manager"); ERROR("Error connecting to cgroup manager");
@ -703,7 +703,7 @@ static int cgm_do_set(const char *controller, const char *file,
if (ret != 0) { if (ret != 0) {
NihError *nerr; NihError *nerr;
nerr = nih_error_get(); 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); nih_free(nerr);
ERROR("Error setting cgroup %s limit %s", file, cgroup); ERROR("Error setting cgroup %s limit %s", file, cgroup);
} }