summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-07-14 23:16:36 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2018-08-16 21:55:16 -0400
commit2e50bb3a9ac5c78640dce91010d3cffde15619cc (patch)
treebf2d2a56c97cd0fa72732ac7b33df93cea40d9f2
parentd7f285d9b9a8c5e6c2982df8779eb399fb18ed78 (diff)
nspawn: get_v1_hierarchies(): Ditch a pointless check for "name=unified"
name=unified isn't a real v1 hierarchy, it's just a made-up name to refer to the v2 hierarchy with a v1-looking string. It will never show up when we ask the kernel for a list of v1 hierarchies. It looks like Tejun Heo just grepped for all uses of "name=systemd" when he introduced name=unified in 2977724b09eb997fc84a80517447b5d4a70770c7.
-rw-r--r--src/nspawn/nspawn-cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index a8a47de017..c91779ea85 100644
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -246,7 +246,7 @@ static int get_v1_hierarchies(Set **ret) {
*e = 0;
- if (STR_IN_SET(l, "", "name=systemd", "name=unified"))
+ if (STR_IN_SET(l, "", "name=systemd"))
continue;
r = set_put_strdup(controllers, l);