From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 16 Mar 2025 14:24:18 +0000 (+0100)
Subject: core/taint: we know we're always running on cgv2 now
X-Git-Tag: v258-rc1~1071^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=399791eaf0f53887e52488b9f4e966d71abeea6a;p=thirdparty%2Fsystemd.git

core/taint: we know we're always running on cgv2 now
---

diff --git a/src/core/taint.c b/src/core/taint.c
index b7a1c647a2b..d02ad7fe53a 100644
--- a/src/core/taint.c
+++ b/src/core/taint.c
@@ -52,9 +52,6 @@ char** taint_strv(void) {
         if (readlink_malloc("/var/run", &var_run) < 0 || !PATH_IN_SET(var_run, "../run", "/run"))
                 stage[n++] = "var-run-bad";
 
-        if (cg_all_unified() == 0)
-                stage[n++] = "cgroupsv1";
-
         if (clock_is_localtime(NULL) > 0)
                 stage[n++] = "local-hwclock";
 
diff --git a/src/test/test-taint.c b/src/test/test-taint.c
index d9aa79dca57..784885824c2 100644
--- a/src/test/test-taint.c
+++ b/src/test/test-taint.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "clock-util.h"
 #include "taint.h"
 #include "tests.h"
 
@@ -8,7 +9,7 @@ TEST(taint_string) {
         assert_se(a);
         log_debug("taint string: '%s'", a);
 
-        assert_se(!!strstr(a, "cgroupsv1") == (cg_all_unified() == 0));
+        assert_se(!!strstr(a, "local-hwclock") == (clock_is_localtime(NULL) > 0));
 }
 
 DEFINE_TEST_MAIN(LOG_DEBUG);