From 9bb69af4f2823fdd30902f5ffd959e9b041feb53 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 8 Feb 2014 20:29:56 -0500 Subject: logind: always kill session when termination is requested KillUserProcesses=yes/no should be ignored when termination is explicitly requested. --- src/login/logind.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/login/logind.c') diff --git a/src/login/logind.c b/src/login/logind.c index a6f84e8536..554409926a 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -862,7 +862,7 @@ void manager_gc(Manager *m, bool drop_not_started) { seat->in_gc_queue = false; if (!seat_check_gc(seat, drop_not_started)) { - seat_stop(seat); + seat_stop(seat, false); seat_free(seat); } } @@ -874,7 +874,7 @@ void manager_gc(Manager *m, bool drop_not_started) { /* First, if we are not closing yet, initiate stopping */ if (!session_check_gc(session, drop_not_started) && session_get_state(session) != SESSION_CLOSING) - session_stop(session); + session_stop(session, false); /* Normally, this should make the session busy again, * if it doesn't then let's get rid of it @@ -891,7 +891,7 @@ void manager_gc(Manager *m, bool drop_not_started) { if (!user_check_gc(user, drop_not_started) && user_get_state(user) != USER_CLOSING) - user_stop(user); + user_stop(user, false); if (!user_check_gc(user, drop_not_started)) { user_finalize(user); -- cgit v1.2.3-54-g00ecf