diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-08-25 04:58:16 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-25 04:58:24 +0200 |
| commit | 77d5f105bf63330350c7bddacdeda914f945590f (patch) | |
| tree | 3db8a21164833c8c0c48ffe6ee7820858d3d19b9 /src/mount-setup.c | |
| parent | ee2083d5cacd8b6065b6a38d284f3e28961775a4 (diff) | |
cgroup: mount cgroup file systems to /sys/fs/cgroup instead of /cgroup
This requires the /sys/fs/cgroup to exist. Current git kernels have
this, released kernels need a backport of a single patch.
Diffstat (limited to 'src/mount-setup.c')
| -rw-r--r-- | src/mount-setup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mount-setup.c b/src/mount-setup.c index 8b4d8c7f44..c1ddbe45f0 100644 --- a/src/mount-setup.c +++ b/src/mount-setup.c @@ -42,13 +42,13 @@ typedef struct MountPoint { } MountPoint; static const MountPoint mount_table[] = { - { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, - { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, - { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID, true }, - { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, - { "devpts", "/dev/pts", "devpts", NULL, MS_NOSUID|MS_NOEXEC, false }, - { "tmpfs", "/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, - { "cgroup", "/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID, true }, + { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "devpts", "/dev/pts", "devpts", NULL, MS_NOSUID|MS_NOEXEC, false }, + { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, }; /* These are API file systems that might be mounted by other software, @@ -75,7 +75,7 @@ bool mount_point_is_api(const char *path) { if (path_equal(path, ignore_paths[i])) return true; - return path_startswith(path, "/cgroup/"); + return path_startswith(path, "/sys/fs/cgroup/"); } static int mount_one(const MountPoint *p) { @@ -138,7 +138,7 @@ static int mount_cgroup_controllers(void) { goto finish; } - if (asprintf(&where, "/cgroup/%s", controller) < 0) { + if (asprintf(&where, "/sys/fs/cgroup/%s", controller) < 0) { free(controller); r = -ENOMEM; goto finish; |