Don't try to set up cgroups for new users

[elogind.git] / src / login / logind-session.c

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 59f765782a668e5d92f188032ec5a848aa79dc11..f55dca385800ca569aae83548d89ce47461d2d74 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -511,7 +511,7 @@ static int session_start_scope(Session *s) {
                 if (!scope)
                         return log_oom();
 
-                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-sessions.service", &error, &job);
+                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "logind.service", "systemd-user-sessions.service", &error, &job);
                 if (r < 0) {
                         log_error("Failed to start session scope %s: %s %s",
                                   scope, bus_error_message(&error, r), error.name);
@@ -547,9 +547,11 @@ int session_start(Session *s) {
                 return r;
 
         /* Create cgroup */
+#if 0
         r = session_start_scope(s);
         if (r < 0)
                 return r;
+#endif
 
         log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
                    LOG_MESSAGE_ID(SD_MESSAGE_SESSION_START),