core/cgroup: remove deserialization for "cpuacct-usage-base"

This has been superseded by "cpu-usage-base" ever since
the introduction of cgroup v2. With upgrading and thus
deserialzing from cgroup v1 systems becoming impossible
it is eligible for removal.

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 118fe988a68166ee29141c39d54730d140fed6c4..c2f6f47e6e0f689f5d1b1c520eb5f61d1159a411 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -4380,8 +4380,7 @@ int cgroup_runtime_deserialize_one(Unit *u, const char *key, const char *value,
         if (!UNIT_HAS_CGROUP_CONTEXT(u))
                 return 0;
 
-        if (MATCH_DESERIALIZE_IMMEDIATE(u, "cpu-usage-base", key, value, safe_atou64, cpu_usage_base) ||
-            MATCH_DESERIALIZE_IMMEDIATE(u, "cpuacct-usage-base", key, value, safe_atou64, cpu_usage_base))
+        if (MATCH_DESERIALIZE_IMMEDIATE(u, "cpu-usage-base", key, value, safe_atou64, cpu_usage_base))
                 return 1;
 
         if (MATCH_DESERIALIZE_IMMEDIATE(u, "cpu-usage-last", key, value, safe_atou64, cpu_usage_last))