proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-05 09:37:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2653 from brauner/2018-09-27/minor_tweaks

Browse Source 
cgroups: tweaks
This commit is contained in:
Stéphane Graber 2018-09-27 14:30:57 +02:00 committed by GitHub
commit 2b35fa3003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lxc/cgroups/cgfsng.c
View File

@ -1376,8 +1376,10 @@ __cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
}
} while (ops->hierarchies[i] && idx > 0 && idx < 1000);
if (idx < 1000)
if (idx < 1000) {
bret = true;
INFO("The monitor process uses \"%s\" as cgroup", monitor_cgroup);
}
on_error:
free(monitor_cgroup);
@ -1454,6 +1456,7 @@ again:
}
ops->container_cgroup = container_cgroup;
INFO("The container uses \"%s\" as cgroup", container_cgroup);
return true;

2
src/lxc/cgroups/cgroup.h
View File

@ -102,7 +102,7 @@ struct cgroup_ops {
char *container_cgroup;
/* Static memory, do not free.*/
char *monitor_pattern;
const char *monitor_pattern;
/* @hierarchies
* - A NULL-terminated array of struct hierarchy, one per legacy