Rename cg_is_unified_systemd_controller_wanted to cg_is_hybrid_wanted

Less typing and doesn't make the table so incredibly wide.

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index f80b6cacfb27b7f922cfc1937520bed053c31737..0b8bda89ea79b1f53b323d5e5232011887917a89 100644 (file)
--- 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 5a82de71fe514db4a32f4b8dd4dc09c08ef0e981..3d14ec3d9d86b50cf3f4f1a1d27febdaf5f23aa9 100644 (file)
--- 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 4e2df0134682703d1f89ca79558acf23eba5c10a..c107aa0a545dc4d2a713d4153fc6fceb71ed72db 100644 (file)
--- 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,