From 95842c3f552072c9d153b3c0200f1bbb5bc3c2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Sun, 15 Dec 2013 12:18:00 +0100 Subject: [PATCH] login: Don't stop a running user manager from garbage-collecting the user. With the current logic, a user will never be garbage-collected, since its manager will always be around. Change the logic such that a user is garbage-collected when it has no sessions and linger is disabled. This is a backport from the master branch to 208 which also backports the improved handling of running slice and service jobs. --- src/login/logind-user.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/login/logind-user.c b/src/login/logind-user.c index adbe638..e2fce5c 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -629,12 +629,6 @@ int user_check_gc(User *u, bool drop_not_started) { if (u->slice_job || u->service_job) return 1; - if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0) - return 1; - - if (u->service && manager_unit_is_active(u->manager, u->service) != 0) - return 1; - return 0; } -- 1.8.5.1