diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-29 20:25:00 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-29 20:25:00 -0400 |
| commit | 1b81db7a664f6402cd8476c7c44ca571bd629bf6 (patch) | |
| tree | d6a5fb1a58728ed77f3bf760b23259dfa02cf0af /src/nspawn/nspawn-mount.c | |
| parent | a9447e0e483e8e2bbd2b044cb78dbe7647da4e63 (diff) | |
| parent | e57051f542080a4ec1d9e4e1c428b39defe9f098 (diff) | |
Merge pull request #2903 from keszybz/cgroup2-v3
core: cgroup2 support
Diffstat (limited to 'src/nspawn/nspawn-mount.c')
| -rw-r--r-- | src/nspawn/nspawn-mount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index 70cca15278..64cb6b3ce3 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -750,7 +750,7 @@ static int mount_unified_cgroups(const char *dest) { return -EINVAL; } - if (mount("cgroup", p, "cgroup", MS_NOSUID|MS_NOEXEC|MS_NODEV, "__DEVEL__sane_behavior") < 0) + if (mount("cgroup", p, "cgroup2", MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL) < 0) return log_error_errno(errno, "Failed to mount unified cgroup hierarchy to %s: %m", p); return 0; |