summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-24 21:50:36 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-24 21:50:36 -0500
commitd3f2e8c826b310b7b48e8394a3726c5bd0efc8ae (patch)
tree01168d7da7ba0e4801fbd3ccb280826c9e7b2766
parent817a2d0c98ca035e2a906c04a4e2509103c583b1 (diff)
Revert "login: Don't stop a running user manager from garbage-collecting the user."
This reverts commit f3656789f8c0d5255809b4057f609247d440ef79. https://bugzilla.redhat.com/show_bug.cgi?id=1053315
-rw-r--r--src/login/logind-user.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index b87311c0d..ddf19eb0b 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -629,6 +629,12 @@ 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;
}