diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-07-25 11:34:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 11:34:37 +0200 |
| commit | 57cd822887e5fe7b3c3a55098ac16544195f3d21 (patch) | |
| tree | 6fcb2a88981c06bdd20299189146b6cb85db0d74 /units | |
| parent | 500b96eb34adda950323e90189c262da3ece57c8 (diff) | |
| parent | 00d85bbb608a0a9b098b606dddb499e868c2dc1e (diff) | |
| download | systemd-57cd822887e5fe7b3c3a55098ac16544195f3d21.tar.gz | |
Merge pull request #13144 from poettering/nspawn-modprobe
nspawn modprobe fixes
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-logind.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-nspawn@.service.in | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in index 1b37290d4f..927f97e94e 100644 --- a/units/systemd-logind.service.in +++ b/units/systemd-logind.service.in @@ -27,6 +27,8 @@ DeviceAllow=char-drm rw DeviceAllow=char-input rw DeviceAllow=char-tty rw DeviceAllow=char-vcs rw +# Make sure the DeviceAllow= lines above can work correctly when referenceing char-drm +ExecStartPre=-/sbin/modprobe -abq drm ExecStart=@rootlibexecdir@/systemd-logind FileDescriptorStoreMax=512 IPAddressDeny=any 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 |