machinectl: show /etc/os-release information of container in status output

[elogind.git] / units / systemd-logind.service.in

diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
index ec05e670f32232ccc2f074d5a67ce6e21ae2e2c7..c6cbd1c8df30a5d2d3babb96d1e4b77f997fac85 100644 (file)
--- 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_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.