diff options
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-bus-proxyd.service.m4.in | 1 | ||||
| -rw-r--r-- | units/systemd-machined.service.in | 2 | ||||
| -rw-r--r-- | units/user/.gitignore | 1 | ||||
| -rw-r--r-- | units/user/systemd-bus-proxyd.service.in | 1 | ||||
| -rw-r--r-- | units/user/systemd-consoled.service.in | 15 |
5 files changed, 3 insertions, 17 deletions
diff --git a/units/systemd-bus-proxyd.service.m4.in b/units/systemd-bus-proxyd.service.m4.in index ffaf0bdc87..64f5ac7d17 100644 --- a/units/systemd-bus-proxyd.service.m4.in +++ b/units/systemd-bus-proxyd.service.m4.in @@ -10,6 +10,7 @@ Description=Legacy D-Bus Protocol Compatibility Daemon [Service] ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/0-system/bus +ExecReload=@bindir@/busctl --address=unix:path=/run/dbus/system_bus_socket call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig NotifyAccess=main CapabilityBoundingSet=CAP_IPC_OWNER CAP_SETUID CAP_SETGID CAP_SETPCAP m4_ifdef(`HAVE_SMACK', CAP_MAC_ADMIN ) PrivateTmp=yes diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in index 19c33959d6..fb1f383cdc 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 +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 WatchdogSec=1min # Note that machined cannot be placed in a mount namespace, since it diff --git a/units/user/.gitignore b/units/user/.gitignore index 6111b10ccf..ce9df9e7e1 100644 --- a/units/user/.gitignore +++ b/units/user/.gitignore @@ -1,3 +1,2 @@ /systemd-exit.service /systemd-bus-proxyd.service -/systemd-consoled.service diff --git a/units/user/systemd-bus-proxyd.service.in b/units/user/systemd-bus-proxyd.service.in index e1e399dc32..6f79707b46 100644 --- a/units/user/systemd-bus-proxyd.service.in +++ b/units/user/systemd-bus-proxyd.service.in @@ -10,4 +10,5 @@ Description=Legacy D-Bus Protocol Compatibility Daemon [Service] ExecStart=@rootlibexecdir@/systemd-bus-proxyd --address=kernel:path=/sys/fs/kdbus/%U-user/bus +ExecReload=@bindir@/busctl --address=unix:path=/run/user/%U/bus call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig NotifyAccess=main diff --git a/units/user/systemd-consoled.service.in b/units/user/systemd-consoled.service.in deleted file mode 100644 index fd7938aa8b..0000000000 --- a/units/user/systemd-consoled.service.in +++ /dev/null @@ -1,15 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Console Manager and Terminal Emulator - -[Service] -Type=notify -Restart=always -RestartSec=0 -ExecStart=@rootlibexecdir@/systemd-consoled |