|
 |
b12df0 |
From 35f9a7f8f4e8917725349fe764706658c02537ca Mon Sep 17 00:00:00 2001
|
|
|
b12df0 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
b12df0 |
Date: Mon, 6 Aug 2018 19:02:29 +0200
|
|
|
b12df0 |
Subject: [PATCH] logind: never elect a session that is stopping as display
|
|
|
b12df0 |
|
|
|
b12df0 |
(cherry picked from commit 04857cd801022d9f9933efb484c6253572f09870)
|
|
|
b12df0 |
|
|
|
b12df0 |
Related: #1642460
|
|
|
b12df0 |
---
|
|
|
b12df0 |
src/login/logind-user.c | 10 ++++------
|
|
|
b12df0 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
b12df0 |
|
|
|
b12df0 |
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
|
|
|
b12df0 |
index 35b2ca5489..3e4c99bdbd 100644
|
|
|
b12df0 |
--- a/src/login/logind-user.c
|
|
|
b12df0 |
+++ b/src/login/logind-user.c
|
|
|
b12df0 |
@@ -613,11 +613,10 @@ int user_kill(User *u, int signo) {
|
|
|
b12df0 |
}
|
|
|
b12df0 |
|
|
|
b12df0 |
static bool elect_display_filter(Session *s) {
|
|
|
b12df0 |
- /* Return true if the session is a candidate for the user’s ‘primary
|
|
|
b12df0 |
- * session’ or ‘display’. */
|
|
|
b12df0 |
+ /* Return true if the session is a candidate for the user’s ‘primary session’ or ‘display’. */
|
|
|
b12df0 |
assert(s);
|
|
|
b12df0 |
|
|
|
b12df0 |
- return (s->class == SESSION_USER && !s->stopping);
|
|
|
b12df0 |
+ return s->class == SESSION_USER && s->started && !s->stopping;
|
|
|
b12df0 |
}
|
|
|
b12df0 |
|
|
|
b12df0 |
static int elect_display_compare(Session *s1, Session *s2) {
|
|
|
b12df0 |
@@ -663,9 +662,8 @@ void user_elect_display(User *u) {
|
|
|
b12df0 |
|
|
|
b12df0 |
assert(u);
|
|
|
b12df0 |
|
|
|
b12df0 |
- /* This elects a primary session for each user, which we call
|
|
|
b12df0 |
- * the "display". We try to keep the assignment stable, but we
|
|
|
b12df0 |
- * "upgrade" to better choices. */
|
|
|
b12df0 |
+ /* This elects a primary session for each user, which we call the "display". We try to keep the assignment
|
|
|
b12df0 |
+ * stable, but we "upgrade" to better choices. */
|
|
|
b12df0 |
log_debug("Electing new display for user %s", u->name);
|
|
|
b12df0 |
|
|
|
b12df0 |
LIST_FOREACH(sessions_by_user, s, u->sessions) {
|