From 064ebd55bb838a4225e8cb525717e315c29d4d8b Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 21 Mar 2013 11:47:56 +0100 Subject: Fix checks for logind It is possible to build systemd without logind or run logind without systemd init, in both cases testing for systemd init is wrong. Check for /run/systemd/seats in the parts which talk to logind instead, as recommended by systemd upstream. For details, see: https://bugzilla.gnome.org/show_bug.cgi?id=696266 --- utils/gdmflexiserver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'utils') diff --git a/utils/gdmflexiserver.c b/utils/gdmflexiserver.c index d1b72fe6..cfeb1757 100644 --- a/utils/gdmflexiserver.c +++ b/utils/gdmflexiserver.c @@ -29,8 +29,9 @@ #include #include +#include "common/gdm-common.h" + #ifdef WITH_SYSTEMD -#include #include #endif @@ -680,7 +681,7 @@ goto_login_session (GError **error) } #ifdef WITH_SYSTEMD - if (sd_booted () > 0) { + if (LOGIND_RUNNING()) { return goto_login_session_for_systemd (connection, error); } #endif -- cgit v1.2.1