forked from pool/systemd
29 lines
1001 B
Diff
29 lines
1001 B
Diff
|
From 63966da86d8e71b1f3f2b57d5448770d526421f9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Bächler <thomas@archlinux.org>
|
||
|
|
Date: Sun, 15 Dec 2013 11:06:37 +0000
|
||
|
|
Subject: 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.
|
||
|
|
---
|
||
|
|
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
|
||
|
|
index 6ba8d98..441e086 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
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
cgit v0.9.0.2-2-gbebe
|