proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 12:37:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable get_cgroup_mount to search for mount points satisfying multiple subsystems at once

Browse Source 
lxc-attach functionality reads /proc/init_pid/cgroup to determine the cgroup
of the container for a given subsystem. However, since subsystems may be
mounted together, we want to be on the safe side and be sure that we really
find the correct mount point, so we allow get_cgroup_mount to check for
*all* the subsystems; the subsystem parameter may now be a comma-separated
list.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Christian Seiler 2012-02-23 09:57:13 +01:00 committed by Daniel Lezcano
parent e16dad1063
commit 3ea24eb8e6
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lxc/cgroup.c
View File

@ -52,6 +52,35 @@ enum {
CGROUP_CLONE_CHILDREN,
};
static char *hasmntopt_multiple(struct mntent *mntent, const char *options)
{
const char *ptr = options;
const char *ptr2 = strchr(options, ',');
char *result;
while (ptr2 != NULL) {
char *option = strndup(ptr, ptr2 - ptr);
if (!option) {
SYSERROR("Temporary memory allocation error");
return NULL;
}
result = hasmntopt(mntent, option);
free(option);
if (!result) {
return NULL;
}
ptr = ptr2 + 1;
ptr2 = strchr(ptr, ',');
}
/* for multiple mount options, the return value is basically NULL
* or non-NULL, so this should suffice for our purposes */
return hasmntopt(mntent, ptr);
}
static int get_cgroup_mount(const char *subsystem, char *mnt)
{
struct mntent *mntent;
@ -67,7 +96,7 @@ static int get_cgroup_mount(const char *subsystem, char *mnt)
if (strcmp(mntent->mnt_type, "cgroup"))
continue;
if (!subsystem || hasmntopt(mntent, subsystem)) {
if (!subsystem || hasmntopt_multiple(mntent, subsystem)) {
strcpy(mnt, mntent->mnt_dir);
fclose(file);
DEBUG("using cgroup mounted at '%s'", mnt);