Rename cg_is_unified_elogind_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 057d8478d8ddbb393fb45c45302df98afebf0913..ad412235347b6376dc9336c31e6505236a460dc4 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2498,7 +2498,7 @@ bool cg_is_legacy_wanted(void) {
         return !cg_is_unified_wanted();
 }
 
         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;
         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 5fbea23d05406f231778ab83db3c48e146bfea16..33b7ba7f44549d7d5ca7d89e9b15a5cc06995c86 100644 (file)
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -255,6 +255,7 @@ bool cg_ns_supported(void);
 
 #if 0 /// UNNEEDED by elogind
 bool cg_all_unified(void);
 
 #if 0 /// UNNEEDED by elogind
 bool cg_all_unified(void);

+bool cg_hybrid_unified(void);

 bool cg_unified(const char *controller);
 int cg_unified_flush(void);
 
 bool cg_unified(const char *controller);
 int cg_unified_flush(void);
 


@@ -262,7 +263,7 @@ bool cg_is_unified_wanted(void);
 #endif // 0
 bool cg_is_legacy_wanted(void);
 #if 0 /// UNNEEDED by elogind
 #endif // 0
 bool cg_is_legacy_wanted(void);
 #if 0 /// UNNEEDED by elogind

-bool cg_is_unified_systemd_controller_wanted(void);
+bool cg_is_hybrid_wanted(void);

 #endif // 0
 
 const char* cgroup_controller_to_string(CGroupController c) _const_;
 #endif // 0
 
 const char* cgroup_controller_to_string(CGroupController c) _const_;

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index f38f1ee8e72c6ffd0800c1536bb94b5963b84931..694a03cc84c267b73d9b7366aee3b5a77659941a 100644 (file)
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -105,19 +105,19 @@ 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 },
 #if 0 /// UNNEEDED by elogind
         { "tmpfs",       "/sys/fs/cgroup",            "tmpfs",      "mode=755",                MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME,
           cg_is_legacy_wanted, MNT_FATAL|MNT_IN_CONTAINER },
 #if 0 /// UNNEEDED by elogind

-        { "cgroup",      "/sys/fs/cgroup/systemd",    "cgroup2",    NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
-          cg_is_unified_systemd_controller_wanted, MNT_IN_CONTAINER },
+        { "cgroup",      "/sys/fs/cgroup/unified",    "cgroup2",    NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
+          cg_is_hybrid_wanted, MNT_IN_CONTAINER },

         { "cgroup",      "/sys/fs/cgroup/systemd",    "cgroup",     "none,name=systemd,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV,
         { "cgroup",      "/sys/fs/cgroup/systemd",    "cgroup",     "none,name=systemd,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV,

-          cg_is_legacy_systemd_controller_wanted, MNT_IN_CONTAINER  },
+          cg_is_legacy_wanted, MNT_IN_CONTAINER     },

         { "cgroup",      "/sys/fs/cgroup/systemd",    "cgroup",     "none,name=systemd",       MS_NOSUID|MS_NOEXEC|MS_NODEV,
         { "cgroup",      "/sys/fs/cgroup/systemd",    "cgroup",     "none,name=systemd",       MS_NOSUID|MS_NOEXEC|MS_NODEV,

-          cg_is_legacy_systemd_controller_wanted, MNT_IN_CONTAINER  },

 #else
         { "cgroup",      "/sys/fs/cgroup/elogind",    "cgroup",     "none,name=elogind,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV,
 #else
         { "cgroup",      "/sys/fs/cgroup/elogind",    "cgroup",     "none,name=elogind,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV,

-          cg_is_legacy_systemd_controller_wanted, MNT_IN_CONTAINER  },
+          cg_is_legacy_wanted, MNT_IN_CONTAINER  },

         { "cgroup",      "/sys/fs/cgroup/elogind",    "cgroup",     "none,name=elogind",       MS_NOSUID|MS_NOEXEC|MS_NODEV,
         { "cgroup",      "/sys/fs/cgroup/elogind",    "cgroup",     "none,name=elogind",       MS_NOSUID|MS_NOEXEC|MS_NODEV,

-          cg_is_legacy_systemd_controller_wanted, MNT_IN_CONTAINER  },
+          cg_is_legacy_wanted, MNT_IN_CONTAINER  },

 #endif // 0
 #if 0 /// UNNEEDED by elogind
 #endif // 0
 #if 0 /// UNNEEDED by elogind

+          cg_is_legacy_wanted, MNT_FATAL|MNT_IN_CONTAINER },

         { "pstore",      "/sys/fs/pstore",            "pstore",     NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
           NULL,          MNT_NONE                   },
 #ifdef ENABLE_EFI
         { "pstore",      "/sys/fs/pstore",            "pstore",     NULL,                      MS_NOSUID|MS_NOEXEC|MS_NODEV,
           NULL,          MNT_NONE                   },
 #ifdef ENABLE_EFI