From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 23 Apr 2024 13:24:55 +0000 (+0800)
Subject: core/manager: drop obsolete cgroup taint string
X-Git-Tag: v256-rc1~37^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b28dfe6e632f47a9058d9378fb88a0c99b34a91;p=thirdparty%2Fsystemd.git

core/manager: drop obsolete cgroup taint string

Wwe can't boot on systems without cgroup anyway
(even cgroup v1 will be gone pretty soon).
---

diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index 04e90e0b75f..87022f40faf 100644
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -558,8 +558,6 @@ Defined-By: systemd
 Support: %SUPPORT_URL%
 
 The following "tags" are possible:
-- "cgroups-missing" — the kernel was compiled without cgroup support or access
-  to expected interface files is restricted
 - "var-run-bad" — /var/run is not a symlink to /run
 - "overflowuid-not-65534" — the kernel user ID used for "unknown" users (with
   NFS or user namespaces) is not 65534
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index 1870ed02bb6..3aa1d0de571 100644
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -1668,14 +1668,6 @@ node /org/freedesktop/systemd1 {
 
         </varlistentry>
 
-        <varlistentry>
-          <term><literal>cgroups-missing</literal></term>
-
-          <listitem><para>Support for cgroups is unavailable.</para>
-
-          <xi:include href="version-info.xml" xpointer="v252"/></listitem>
-        </varlistentry>
-
         <varlistentry>
           <term><literal>cgroupsv1</literal></term>
 
diff --git a/src/core/manager.c b/src/core/manager.c
index 0078f5a33f8..856bbd823c4 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4836,22 +4836,19 @@ static int short_uid_range(const char *path) {
 }
 
 char* manager_taint_string(const Manager *m) {
+        const char *stage[11] = {};
+        size_t n = 0;
+
         /* Returns a "taint string", e.g. "local-hwclock:var-run-bad". Only things that are detected at
          * runtime should be tagged here. For stuff that is known during compilation, emit a warning in the
          * configuration phase. */
 
         assert(m);
 
-        const char* stage[12] = {};
-        size_t n = 0;
-
         _cleanup_free_ char *usrbin = NULL;
         if (readlink_malloc("/bin", &usrbin) < 0 || !PATH_IN_SET(usrbin, "usr/bin", "/usr/bin"))
                 stage[n++] = "unmerged-usr";
 
-        if (access("/proc/cgroups", F_OK) < 0)
-                stage[n++] = "cgroups-missing";
-
         if (cg_all_unified() == 0)
                 stage[n++] = "cgroupsv1";