diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2018-06-20 19:13:05 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-06-29 07:12:51 +0200 |
| commit | f0a7917bc8ea0ba859e10093517e33f2bad78f10 (patch) | |
| tree | 68dce7b70d5577a3f533a6119b8775701279055c /src/core/mount-setup.c | |
| parent | 4f703de664738f58bc92834f2cd75234254eb07f (diff) | |
Fix cgroup directory mounting:
A little misunderstanding has been fixed, and elogind now mounts the following
directories, if (and only if) it has to act as its own cgroups controller.
* -Ddefault-hierarchy=legacy : /sys/fs/cgroup as tmpfs
/sys/fs/cgroup/elogind as cgroup
* -Ddefault-hierarchy=hybrid : The same as with 'legacy', plus
/sys/fs/cgroup/unified as cgroup2
* -Ddefault-hierarchy=unified : /sys/fs/cgroup2 as cgroup2
Diffstat (limited to 'src/core/mount-setup.c')
| -rw-r--r-- | src/core/mount-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 0b41e26e6..f08abb640 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -103,11 +103,11 @@ static const MountPoint mount_table[] = { #endif { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, NULL, MNT_FATAL|MNT_IN_CONTAINER }, +#endif // 0 { "cgroup2", "/sys/fs/cgroup", "cgroup2", "nsdelegate", MS_NOSUID|MS_NOEXEC|MS_NODEV, cg_is_unified_wanted, MNT_IN_CONTAINER|MNT_CHECK_WRITABLE }, { "cgroup2", "/sys/fs/cgroup", "cgroup2", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, cg_is_unified_wanted, MNT_IN_CONTAINER|MNT_CHECK_WRITABLE }, -#endif // 0 { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, cg_is_legacy_wanted, MNT_FATAL|MNT_IN_CONTAINER }, { "cgroup2", "/sys/fs/cgroup/unified", "cgroup2", "nsdelegate", MS_NOSUID|MS_NOEXEC|MS_NODEV, @@ -130,7 +130,7 @@ static const MountPoint mount_table[] = { #else { "cgroup", "/sys/fs/cgroup/elogind", "cgroup", "none,name=elogind,release_agent="SYSTEMD_CGROUP_AGENT_PATH",xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV, cg_is_legacy_wanted, MNT_IN_CONTAINER }, - { "cgroup", "/sys/fs/cgroup/elogind", "cgroup", "none,name=elogind,release_agent="SYSTEMD_CGROUP_AGENT_PATH, MS_NOSUID|MS_NOEXEC|MS_NODEV, + { "cgroup", "/sys/fs/cgroup/eloignd", "cgroup", "none,name=elogind,release_agent="SYSTEMD_CGROUP_AGENT_PATH, MS_NOSUID|MS_NOEXEC|MS_NODEV, cg_is_legacy_wanted, MNT_FATAL|MNT_IN_CONTAINER }, #endif // 0 }; |