chiark / gitweb /
cgroup: don't ever try to destroy the cgroup of the root slice
authorLennart Poettering <lennart@poettering.net>
Thu, 11 Jul 2013 16:42:12 +0000 (18:42 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 11 Jul 2013 16:49:52 +0000 (18:49 +0200)
The root slice is after all the root cgroup, so don't attempt to delete
it.

src/core/cgroup.c

index b9ef00c6174d487d6ed4e1643cbb5e49f29aab66..d0f36cb18ed8d29450d820c5f7277b3d69b03e48 100644 (file)
@@ -531,7 +531,7 @@ void unit_destroy_cgroup(Unit *u) {
         if (!u->cgroup_path)
                 return;
 
-        r = cg_trim_with_mask(u->cgroup_mask, u->cgroup_path, true);
+        r = cg_trim_with_mask(u->cgroup_mask, u->cgroup_path, !unit_has_name(u, SPECIAL_ROOT_SLICE));
         if (r < 0)
                 log_debug("Failed to destroy cgroup %s: %s", u->cgroup_path, strerror(-r));