diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-05-31 07:08:06 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:12:58 +0200 |
commit | 73ca6c4e5ef43b820dd6e643fe861b11cdb70a4c (patch) | |
tree | 31ee272a468bd1c6b6b98071454044a539d066b5 /src/core/mount-setup.c | |
parent | a59143ddf77a64e2d13952606526dfb659b610b8 (diff) |
Prep v230: Apply missing upstream fixes and updates (4/8) src/core.
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 0d73ce6fa..9b52a10d7 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -96,7 +96,7 @@ static const MountPoint mount_table[] = { #endif { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, NULL, MNT_FATAL|MNT_IN_CONTAINER }, - { "cgroup", "/sys/fs/cgroup", "cgroup", "__DEVEL__sane_behavior", MS_NOSUID|MS_NOEXEC|MS_NODEV, + { "cgroup", "/sys/fs/cgroup", "cgroup2", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, cg_is_unified_wanted, MNT_FATAL|MNT_IN_CONTAINER }, #endif // 0 { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, |