diff options
Diffstat (limited to 'units')
| -rw-r--r-- | units/emergency.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-machined.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-nspawn@.service.in | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/units/emergency.service.in b/units/emergency.service.in index fb390eacfe..0de16f24e8 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -11,6 +11,7 @@ Documentation=man:sulogin(8) DefaultDependencies=no Conflicts=shutdown.target Conflicts=rescue.service +Conflicts=syslog.socket Before=shutdown.target [Service] diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in index 3710c595ca..685baab21d 100644 --- a/units/systemd-machined.service.in +++ b/units/systemd-machined.service.in @@ -15,7 +15,7 @@ After=machine.slice [Service] ExecStart=@rootlibexecdir@/systemd-machined BusName=org.freedesktop.machine1 -CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID +CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD WatchdogSec=3min # Note that machined cannot be placed in a mount namespace, since it diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in index 1927c4d485..ea28941507 100644 --- a/units/systemd-nspawn@.service.in +++ b/units/systemd-nspawn@.service.in @@ -13,7 +13,7 @@ Before=machines.target After=network.target [Service] -ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i +ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i KillMode=mixed Type=notify RestartForceExitStatus=133 |