diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-19 21:36:56 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-22 17:52:31 +0100 |
| commit | a4464b952238cdcdab64f3dadb288700dcd25065 (patch) | |
| tree | 4380561e976751a42b5b3f7bd7a5e84dca1f2310 /src | |
| parent | build-sys: default to hybrid cgroup hierarchy (diff) | |
| download | systemd-a4464b952238cdcdab64f3dadb288700dcd25065.tar.xz systemd-a4464b952238cdcdab64f3dadb288700dcd25065.zip | |
Rename cg_is_unified_systemd_controller_wanted to cg_is_hybrid_wanted
Less typing and doesn't make the table so incredibly wide.
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/cgroup-util.c | 2 | ||||
| -rw-r--r-- | src/basic/cgroup-util.h | 2 | ||||
| -rw-r--r-- | src/core/mount-setup.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index f80b6cacfb..0b8bda89ea 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2432,7 +2432,7 @@ bool cg_is_legacy_wanted(void) { return !cg_is_unified_wanted(); } -bool cg_is_unified_systemd_controller_wanted(void) { +bool cg_is_hybrid_wanted(void) { static thread_local int wanted = -1; int r; bool b; diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 5a82de71fe..3d14ec3d9d 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -247,7 +247,7 @@ int cg_unified_flush(void); bool cg_is_unified_wanted(void); bool cg_is_legacy_wanted(void); -bool cg_is_unified_systemd_controller_wanted(void); +bool cg_is_hybrid_wanted(void); const char* cgroup_controller_to_string(CGroupController c) _const_; CGroupController cgroup_controller_from_string(const char *s) _pure_; diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 4e2df01346..c107aa0a54 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -100,7 +100,7 @@ static const MountPoint mount_table[] = { { "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, - cg_is_unified_systemd_controller_wanted, MNT_IN_CONTAINER }, + cg_is_hybrid_wanted, MNT_IN_CONTAINER }, { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV, cg_is_legacy_wanted, MNT_IN_CONTAINER }, { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, |