daandemeyer / rpms / systemd

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