summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-07-23 13:11:09 +0200
committerLennart Poettering <lennart@poettering.net>2019-07-23 13:30:56 +0200
commit31ea9c89d49d16b912cd7c1f241f83402eb8c626 (patch)
treed82328b6f4bb3b256c6e345e97d7cff85e10fc70 /units
parent877aa0bdcc2900712b02dac90856f181b93c4e40 (diff)
downloadsystemd-31ea9c89d49d16b912cd7c1f241f83402eb8c626.tar.gz
nspawn: explicitly load units beforehand so that DeviceAllow= syntax works
Yuck, but I don't see any prettier solution. Fixes: #13130
Diffstat (limited to 'units')
-rw-r--r--units/systemd-nspawn@.service.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index c3194d4f21..2473a730b4 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -16,6 +16,8 @@ After=network.target systemd-resolved.service
RequiresMountsFor=/var/lib/machines
[Service]
+# Make sure the DeviceAllow= lines below can properly resolve the 'block-loop' expression (and others)
+ExecStartPre=-/sbin/modprobe -abq tun loop dm-mod
ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i
KillMode=mixed
Type=notify