diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-01-06 08:00:16 +0400 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-01-08 18:11:37 +0800 |
| commit | 8b255ecd99dfee4e27b40a075b15d1e117f819fa (patch) | |
| tree | 29e06155680211970985f3b760806edd3acecf68 /units | |
| parent | bc6422cbd1dfc258fb2b4909a2a25ad356e63400 (diff) | |
pam_systemd: export DBUS_SESSION_BUS_ADDRESS
Diffstat (limited to 'units')
| -rw-r--r-- | units/.gitignore | 1 | ||||
| -rw-r--r-- | units/user@.service.in (renamed from units/user@.service.m4.in) | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/units/.gitignore b/units/.gitignore index cb9fa1c0c4..76c4cb39e6 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -65,5 +65,4 @@ /systemd-update-utmp.service /systemd-user-sessions.service /systemd-vconsole-setup.service -/user@.service.m4 /user@.service diff --git a/units/user@.service.m4.in b/units/user@.service.in index 7b7d52b60b..c2d495f53f 100644 --- a/units/user@.service.m4.in +++ b/units/user@.service.in @@ -6,17 +6,12 @@ # (at your option) any later version. [Unit] -Description=User Manager for %I +Description=User Manager for %i After=systemd-user-sessions.service [Service] -User=%I +User=%i 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 |