chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: allow restarting journald without losing stream connections
[elogind.git]
/
units
/
user@.service.m4.in
diff --git
a/units/user@.service.m4.in
b/units/user@.service.m4.in
index 7b7d52b60bacbd97a5b40068ca7f809b4b167219..1e21d51aaef5b1833577b6bd2db6c2536bc87898 100644
(file)
--- a/
units/user@.service.m4.in
+++ b/
units/user@.service.m4.in
@@
-6,17
+6,14
@@
# (at your option) any later version.
[Unit]
# (at your option) any later version.
[Unit]
-Description=User Manager for
%I
+Description=User Manager for
UID %i
After=systemd-user-sessions.service
[Service]
After=systemd-user-sessions.service
[Service]
-User=%
I
+User=%
i
PAMName=systemd-user
Type=notify
ExecStart=-@rootlibexecdir@/systemd --user
PAMName=systemd-user
Type=notify
ExecStart=-@rootlibexecdir@/systemd --user
-m4_ifdef(`ENABLE_KDBUS',
-Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/dev/kdbus/%I-user/bus;unix:path=/run/user/%I/bus
-,m4_dnl
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/bus
-)m4_dnl
Slice=user-%i.slice
Slice=user-%i.slice
+KillMode=mixed
+Delegate=yes