1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-24 14:50:17 +03:00

core/manager: drop obsolete cgroup taint string

Wwe can't boot on systems without cgroup anyway
(even cgroup v1 will be gone pretty soon).
This commit is contained in:
Mike Yuan 2024-04-23 21:24:55 +08:00
parent 21f8e749a1
commit 2b28dfe6e6
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
3 changed files with 3 additions and 16 deletions

View File

@ -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

View File

@ -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>

View File

@ -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";