summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalint Reczey <balint.reczey@canonical.com>2020-03-22 21:37:06 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-26 14:09:15 +0100
commit9b52ce58de50dfb387efeeb3c78d7cfcecc06ae3 (patch)
treeb54a088069a07da03009d1d2271d8afbf3c996b7
parentcd6ff773bd1fccab8a8ee3b3f428014a6c75e659 (diff)
downloadsystemd-9b52ce58de50dfb387efeeb3c78d7cfcecc06ae3.tar.gz
units: Don't mount tracefs in LXC
Mounting tracefs fails in unprivileged LXC containers and latest LXD (3.23) bind mounts tracefs already. Fixes https://github.com/lxc/lxd/issues/7059 (cherry picked from commit cdc6c95737d26b1746b446dfe662872d593d23c6)
-rw-r--r--units/sys-kernel-tracing.mount1
1 files changed, 1 insertions, 0 deletions
diff --git a/units/sys-kernel-tracing.mount b/units/sys-kernel-tracing.mount
index cb42b47012..e29b258a47 100644
--- a/units/sys-kernel-tracing.mount
+++ b/units/sys-kernel-tracing.mount
@@ -12,6 +12,7 @@ Description=Kernel Trace File System
Documentation=https://www.kernel.org/doc/Documentation/trace/ftrace.txt
Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
+ConditionVirtualization=!lxc
ConditionPathExists=/sys/kernel/tracing
ConditionCapability=CAP_SYS_RAWIO
Before=sysinit.target