diff options
| author | Martin Pitt <martinpitt@gnome.org> | 2013-03-21 11:47:56 +0100 |
|---|---|---|
| committer | Martin Pitt <martinpitt@gnome.org> | 2013-03-29 11:04:18 +0100 |
| commit | 064ebd55bb838a4225e8cb525717e315c29d4d8b (patch) | |
| tree | 16e9d8f8c0ad56ca6eb3157fc173e6ef3d3eef96 /utils | |
| parent | 1fe1e565300eb9472cfc4348e4bceef5ef25512a (diff) | |
| download | gdm-064ebd55bb838a4225e8cb525717e315c29d4d8b.tar.gz | |
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://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00092.html>
https://bugzilla.gnome.org/show_bug.cgi?id=696266
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/gdmflexiserver.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 <glib/gi18n.h> #include <gtk/gtk.h> +#include "common/gdm-common.h" + #ifdef WITH_SYSTEMD -#include <systemd/sd-daemon.h> #include <systemd/sd-login.h> #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 |