Prep v232: Do not listen to SYSTEMD_* environment variables to override things.

[elogind.git] / src / basic / cgroup-util.c

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 64220ac085c0cbed5c5bcb12d76258e2ec0c4402..9dd93d00b0a9d88e780e668c32bcc2b622627862 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2454,9 +2454,6 @@ bool cg_is_unified_wanted(void) {
 bool cg_is_legacy_wanted(void) {
         return !cg_is_unified_wanted();
 }
 bool cg_is_legacy_wanted(void) {
         return !cg_is_unified_wanted();
 }

-#else
-bool cg_is_legacy_wanted(void) {
-        return true;

 
 bool cg_is_unified_systemd_controller_wanted(void) {
         static thread_local int wanted = -1;
 
 bool cg_is_unified_systemd_controller_wanted(void) {
         static thread_local int wanted = -1;


@@ -2503,6 +2500,10 @@ bool cg_is_unified_systemd_controller_wanted(void) {
 bool cg_is_legacy_systemd_controller_wanted(void) {
         return cg_is_legacy_wanted() && !cg_is_unified_systemd_controller_wanted();
 }
 bool cg_is_legacy_systemd_controller_wanted(void) {
         return cg_is_legacy_wanted() && !cg_is_unified_systemd_controller_wanted();
 }

+#else
+bool cg_is_legacy_wanted(void) {
+        return true;
+}

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