forked from pool/systemd
b8b836245b
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/request/show/149703 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 1ca04b87979b2add53ebb8a7fdf13c34fb6c2743 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Mon, 14 Jan 2013 21:40:38 +0100
|
|
Subject: [PATCH] logind: ignore non-tty/non-x11 session when checking if
|
|
there are other sessions before shutting down
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=890827
|
|
---
|
|
src/login/logind-dbus.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
|
|
index 77a06f2..d64debe 100644
|
|
--- a/src/login/logind-dbus.c
|
|
+++ b/src/login/logind-dbus.c
|
|
@@ -979,9 +979,12 @@ static int have_multiple_sessions(
|
|
|
|
assert(m);
|
|
|
|
- /* Check for other users' sessions. Greeter sessions do not count. */
|
|
+ /* Check for other users' sessions. Greeter sessions do not
|
|
+ * count, and non-login sessions do not count either. */
|
|
HASHMAP_FOREACH(session, m->sessions, i)
|
|
- if (session->class == SESSION_USER && session->user->uid != uid)
|
|
+ if (session->class == SESSION_USER &&
|
|
+ (session->type == SESSION_TTY || session->type == SESSION_X11) &&
|
|
+ session->user->uid != uid)
|
|
return true;
|
|
|
|
return false;
|
|
--
|
|
1.7.10.4
|
|
|