summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
Diffstat (limited to 'units')
-rw-r--r--units/.gitignore1
-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