diff options
| author |   Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-19 15:59:21 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-22 11:52:31 -0500 |
| commit | 1b59cf04aee20525179f81928f1e1794ce970551 (patch) | |
| tree | 4eedd6ff0980be83d54faa39e7b50e9779d2f98b /src/core/mount-setup.c | |
| parent | Rename cg_is_unified_systemd_controller_wanted to cg_is_hybrid_wanted (diff) | |
| download | systemd-1b59cf04aee20525179f81928f1e1794ce970551.tar.gz systemd-1b59cf04aee20525179f81928f1e1794ce970551.tar.bz2 systemd-1b59cf04aee20525179f81928f1e1794ce970551.zip | |
core/mount-setup: if unified hierarchy is not supported, fall back to legacy
We need this to gracefully support older or strangely configured kernels.
v2:
- do not install a callback handler, just embed the right conditions into
cg_is_*_wanted()
v3:
- fix bug in cg_is_legacy_wanted()
Diffstat (limited to 'src/core/mount-setup.c')
| -rw-r--r-- | src/core/mount-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index c107aa0a5..7295efbf3 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -96,7 +96,7 @@ static const MountPoint mount_table[] = { { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, NULL, MNT_FATAL|MNT_IN_CONTAINER }, { "cgroup", "/sys/fs/cgroup", "cgroup2", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, - cg_is_unified_wanted, MNT_FATAL|MNT_IN_CONTAINER }, + cg_is_unified_wanted, MNT_IN_CONTAINER }, { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, cg_is_legacy_wanted, MNT_FATAL|MNT_IN_CONTAINER }, { "cgroup", "/sys/fs/cgroup/unified", "cgroup2", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, |