diff options
author | Timothée Ravier | 2014-01-16 21:35:46 +0100 |
---|---|---|
committer | Timothée Ravier | 2014-01-16 21:35:46 +0100 |
commit | ca7d932b5e01e07129a1141c8cb23a088522bf49 (patch) | |
tree | fbf762bf34b3ec6e723995b68f154d19b45136a1 /0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch | |
parent | 2178d8e3efb01da15f7706c75f500be3d3540ec3 (diff) | |
download | aur-ca7d932b5e01e07129a1141c8cb23a088522bf49.tar.gz |
systemd-selinux 208-10 update
Diffstat (limited to '0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch')
-rw-r--r-- | 0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch b/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch new file mode 100644 index 000000000000..9a92209e341b --- /dev/null +++ b/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch @@ -0,0 +1,36 @@ +From 95842c3f552072c9d153b3c0200f1bbb5bc3c2fb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> +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 + |