Blame SOURCES/0629-logind-propagate-session-stop-errors.patch
|
 |
b677e7 |
From 31aa21a13f9b91486b1a95c5b73fa088af77fcb4 Mon Sep 17 00:00:00 2001
|
|
|
b677e7 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
b677e7 |
Date: Mon, 6 Aug 2018 19:35:44 +0200
|
|
|
b677e7 |
Subject: [PATCH] logind: propagate session stop errors
|
|
|
b677e7 |
|
|
|
b677e7 |
Let's propagate errors from stopping sessions via seat_stop(). This is
|
|
|
b677e7 |
similar to how we propagate such errors in user_stop() for all sessions
|
|
|
b677e7 |
associated with a user.
|
|
|
b677e7 |
|
|
|
b677e7 |
Note that we propagate these errors, but we don't abort the function.
|
|
|
b677e7 |
|
|
|
b677e7 |
(cherry picked from commit e6958b7ea33813b085966ac25817a957c0dad7f9)
|
|
|
b677e7 |
|
|
|
b677e7 |
Related: #1642460
|
|
|
b677e7 |
---
|
|
|
b677e7 |
src/login/logind-seat.c | 4 ++--
|
|
|
b677e7 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
b677e7 |
|
|
|
b677e7 |
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
|
|
|
b677e7 |
index 9e4f009643..96c34a6c9e 100644
|
|
|
b677e7 |
--- a/src/login/logind-seat.c
|
|
|
b677e7 |
+++ b/src/login/logind-seat.c
|
|
|
b677e7 |
@@ -431,7 +431,7 @@ int seat_start(Seat *s) {
|
|
|
b677e7 |
}
|
|
|
b677e7 |
|
|
|
b677e7 |
int seat_stop(Seat *s, bool force) {
|
|
|
b677e7 |
- int r = 0;
|
|
|
b677e7 |
+ int r;
|
|
|
b677e7 |
|
|
|
b677e7 |
assert(s);
|
|
|
b677e7 |
|
|
|
b677e7 |
@@ -441,7 +441,7 @@ int seat_stop(Seat *s, bool force) {
|
|
|
b677e7 |
"SEAT_ID=%s", s->id,
|
|
|
b677e7 |
LOG_MESSAGE("Removed seat %s.", s->id));
|
|
|
b677e7 |
|
|
|
b677e7 |
- seat_stop_sessions(s, force);
|
|
|
b677e7 |
+ r = seat_stop_sessions(s, force);
|
|
|
b677e7 |
|
|
|
b677e7 |
unlink(s->state_file);
|
|
|
b677e7 |
seat_add_to_gc_queue(s);
|