diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-05-17 23:54:44 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-05-17 23:54:44 +0200 |
| commit | 53f7d807bff9c39e9e565ad2fb20f29b4306af40 (patch) | |
| tree | 4a77b49b0d08b270154da7b20286be0291e2139e /src | |
| parent | e82e442bfa66eb982b1694250bdafdbd0de54032 (diff) | |
cgroup: don't require debug cgroup controller anymore, use name hierarchy instead
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgroup.c | 2 | ||||
| -rw-r--r-- | src/mount-setup.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/cgroup.c b/src/cgroup.c index 301fc94..56529eb 100644 --- a/src/cgroup.c +++ b/src/cgroup.c @@ -422,7 +422,7 @@ int manager_setup_cgroup(Manager *m) { } free(m->cgroup_controller); - if (!(m->cgroup_controller = strdup("debug"))) + if (!(m->cgroup_controller = strdup("name=systemd"))) return -ENOMEM; if ((r = cgroup_get_subsys_mount_point(m->cgroup_controller, &mp))) diff --git a/src/mount-setup.c b/src/mount-setup.c index cb91e18..e4f2b73 100644 --- a/src/mount-setup.c +++ b/src/mount-setup.c @@ -42,15 +42,15 @@ 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 }, - { "devtmps", "/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|MS_NODEV, false }, - { "cgroup", "/cgroup/debug", "cgroup", "debug", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, - { "debugfs", "/sys/kernel/debug", "debugfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false }, - { "binfmt_misc", "/proc/sys/fs/binfmt_misc", "binfmt_misc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false }, - { "mqueue", "/dev/mqueue", "mqueue", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false }, + { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "devtmps", "/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|MS_NODEV, false }, + { "cgroup", "/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, + { "debugfs", "/sys/kernel/debug", "debugfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false }, + { "binfmt_misc", "/proc/sys/fs/binfmt_misc", "binfmt_misc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false }, + { "mqueue", "/dev/mqueue", "mqueue", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false }, }; bool mount_point_is_api(const char *path) { |