From: Alan Jenkins <alan.christopher.jenkins@gmail.com>
Date: Thu, 16 Nov 2017 10:02:34 +0000 (+0000)
Subject: systemctl: other wayland sessions should inhibit shutdown, like x11 sessions do ... 
X-Git-Tag: v236~203
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28abce5d25111571e89e3b1feb25033131d2ebfb;p=thirdparty%2Fsystemd.git

systemctl: other wayland sessions should inhibit shutdown, like x11 sessions do (#7353)

Update systemctl code to match the manpage for sd_session_get_type().

"wayland" sessions should be treated the same as "x11".  "mir" too, fwiw.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index f8c8c318a3c..9d9b45f08ad 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3417,7 +3417,7 @@ static int logind_check_inhibitors(enum action a) {
                 if (sd_session_get_class(*s, &class) < 0 || !streq(class, "user"))
                         continue;
 
-                if (sd_session_get_type(*s, &type) < 0 || !STR_IN_SET(type, "x11", "tty"))
+                if (sd_session_get_type(*s, &type) < 0 || !STR_IN_SET(type, "x11", "wayland", "tty", "mir"))
                         continue;
 
                 sd_session_get_tty(*s, &tty);