[gnome-screensaver] Check for logind, not for systemd
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-screensaver] Check for logind, not for systemd
- Date: Thu, 21 Mar 2013 15:51:12 +0000 (UTC)
commit fd353244020cf53ce58f4abf69a5ec7893ca1fd1
Author: Martin Pitt <martinpitt gnome org>
Date: Thu Mar 21 11:24:20 2013 +0100
Check for logind, not for systemd
It is possible to build systemd without logind, in which case
/sys/fs/cgroup/systemd would still exist. Check for /run/systemd/seats instead,
as recommended by systemd upstream.
For details, see:
<https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00092.html>
Drop the now unnecessary linking against libsystemd-daemon.
https://bugzilla.gnome.org/show_bug.cgi?id=696264
configure.ac | 2 +-
src/gs-listener-dbus.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0e8f339..3451989 100644
--- a/configure.ac
+++ b/configure.ac
@@ -601,7 +601,7 @@ AC_ARG_WITH(systemd,
[with_systemd=$withval], [with_systemd=auto])
PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login libsystemd-daemon],
+ [libsystemd-login],
[have_systemd=yes], [have_systemd=no])
if test "x$with_systemd" = "xauto" ; then
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index 28774a0..7f718fa 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <time.h>
#include <string.h>
+#include <unistd.h>
#include <glib/gi18n.h>
@@ -33,7 +34,6 @@
#include <dbus/dbus-glib-lowlevel.h>
#ifdef WITH_SYSTEMD
-#include <systemd/sd-daemon.h>
#include <systemd/sd-login.h>
#endif
@@ -1478,7 +1478,8 @@ gs_listener_init (GSListener *listener)
listener->priv = GS_LISTENER_GET_PRIVATE (listener);
#ifdef WITH_SYSTEMD
- listener->priv->have_systemd = sd_booted () > 0;
+ /* check if logind is running */
+ listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
#endif
gs_listener_dbus_init (listener);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]