X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fsystemd-logind.service.in;h=f087e99ce2e75f7470199c676af72ef1570243f8;hp=ec05e670f32232ccc2f074d5a67ce6e21ae2e2c7;hb=132764a2236fd6a4acb0e8d698f135c186677ad4;hpb=9444b1f20e311f073864d81e913bd4f32fe95cfd

diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
index ec05e670f..f087e99ce 100644
--- a/units/systemd-logind.service.in
+++ b/units/systemd-logind.service.in
@@ -8,16 +8,23 @@
 [Unit]
 Description=Login Service
 Documentation=man:systemd-logind.service(8) man:logind.conf(5)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/logind
 Documentation=http://www.freedesktop.org/wiki/Software/systemd/multiseat
-Wants=user.slice machine.slice
-After=nss-user-lookup.target user.slice machine.slice
+Wants=user.slice
+After=nss-user-lookup.target user.slice
+
+# Ask for the dbus socket. If running over kdbus, the socket will
+# not be actually used.
+Wants=dbus.socket
+After=dbus.socket
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-logind
 Restart=always
 RestartSec=0
 BusName=org.freedesktop.login1
-CapabilityBoundingSet=CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER CAP_SYS_TTY_CONFIG
+CapabilityBoundingSet=CAP_SYS_ADMIN CAP_MAC_ADMIN CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER CAP_SYS_TTY_CONFIG
+WatchdogSec=1min
 
 # Increase the default a bit in order to allow many simultaneous
 # logins since we keep one fd open per session.