units: Add SHELL environment variable

[elogind.git] / units / user@.service.in

diff --git a/units/user@.service.in b/units/user@.service.in
index 3cf1347b16c95a1b777222d043d05eb438c2add2..3718a57087c457000d0f7c1b0c56bd9c1799f740 100644 (file)
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -6,18 +6,14 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=User Manager for %u
+Description=User Manager for %I
 After=systemd-user-sessions.service
 
 [Service]
 User=%I
-PAMName=systemd-shared
-# in order to allow MEM_CG features to work, add "memory:/" here
-ControlGroup=%R/user/%U.user/shared cpu:/
-ControlGroupModify=yes
+PAMName=systemd-user
 Type=notify
+Environment=SHELL=%s
 ExecStart=-@rootlibexecdir@/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
-
-[Install]
-Alias=user@%i.service
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+Slice=user-%i.slice