Attachment 76863 Details for Bug 62593 – consolekit, systemd: Check for logind, not for systemd

[patch] consolekit, systemd: Check for logind, not for systemd

0001-consolekit-systemd-Check-for-logind-not-for-systemd.patch (text/plain), 3.79 KB, created by Martin Pitt on 2013-03-21 13:44:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Pitt

Created: 2013-03-21 13:44:19 UTC

Size: 3.79 KB

patch

obsolete

>From 70ffc17f9d17ab587d7608ef2c491948747ffd21 Mon Sep 17 00:00:00 2001
>From: Martin Pitt <martinpitt@gnome.org>
>Date: Thu, 21 Mar 2013 14:17:33 +0100
>Subject: [PATCH] consolekit, systemd: Check for logind, not for systemd
>
>It is possible to build systemd without logind, in which case sd_booted() wo
>succeed. Check for /run/systemd/seats to test for logind 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, and stop linking
>the consolekit module to any systemd library.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=62593
>---
> configure.ac                       |  2 +-
> src/Makefile.am                    |  4 ++--
> src/modules/module-console-kit.c   | 13 +++----------
> src/modules/module-systemd-login.c |  5 ++---
> 4 files changed, 8 insertions(+), 16 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 8a02cb7..43d3b44 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1163,7 +1163,7 @@ AC_ARG_ENABLE([systemd],
>     AS_HELP_STRING([--disable-systemd],[Disable optional systemd support]))
> 
> AS_IF([test "x$enable_systemd" != "xno"],
>-    [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login libsystemd-daemon ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)],
>+    [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)],
>     HAVE_SYSTEMD=0)
> 
> AS_IF([test "x$enable_systemd" = "xyes" && test "x$HAVE_SYSTEMD" = "x0"],
>diff --git a/src/Makefile.am b/src/Makefile.am
>index 649cbc5..9cef2b9 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -1962,8 +1962,8 @@ module_udev_detect_la_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS)
> 
> module_console_kit_la_SOURCES = modules/module-console-kit.c
> module_console_kit_la_LDFLAGS = $(MODULE_LDFLAGS)
>-module_console_kit_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SYSTEMD_LIBS)
>-module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SYSTEMD_CFLAGS)
>+module_console_kit_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
>+module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
> 
> module_systemd_login_la_SOURCES = modules/module-systemd-login.c
> module_systemd_login_la_LDFLAGS = $(MODULE_LDFLAGS)
>diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
>index c9c2f45..af1e02b 100644
>--- a/src/modules/module-console-kit.c
>+++ b/src/modules/module-console-kit.c
>@@ -30,11 +30,6 @@
> #include <stdlib.h>
> #include <sys/types.h>
> 
>-#ifdef HAVE_SYSTEMD
>-#include <systemd/sd-login.h>
>-#include <systemd/sd-daemon.h>
>-#endif
>-
> #include <pulse/xmalloc.h>
> 
> #include <pulsecore/module.h>
>@@ -285,12 +280,10 @@ int pa__init(pa_module*m) {
> 
>     dbus_error_init(&error);
> 
>-#ifdef HAVE_SYSTEMD
>-    /* If systemd support is enabled and we boot on systemd we
>-       shouldn't watch ConsoleKit but systemd's logind service. */
>-    if (sd_booted() > 0)
>+    /* If systemd's logind service is running, we shouldn't watch ConsoleKit
>+     * but login */
>+    if (access("/run/systemd/seats/", F_OK) >= 0)
>         return 0;
>-#endif
> 
>     if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
>         pa_log("Failed to parse module arguments");
>diff --git a/src/modules/module-systemd-login.c b/src/modules/module-systemd-login.c
>index 8ad836e..cc8b462 100644
>--- a/src/modules/module-systemd-login.c
>+++ b/src/modules/module-systemd-login.c
>@@ -31,7 +31,6 @@
> #include <sys/types.h>
> 
> #include <systemd/sd-login.h>
>-#include <systemd/sd-daemon.h>
> 
> #include <pulse/xmalloc.h>
> 
>@@ -169,8 +168,8 @@ int pa__init(pa_module *m) {
> 
>     pa_assert(m);
> 
>-    /* If we are not actually booting with systemd become a NOP */
>-    if (sd_booted() <= 0)
>+    /* If we are not actually running logind become a NOP */
>+    if (access("/run/systemd/seats/", F_OK) < 0)
>         return 0;
> 
>     ma = pa_modargs_new(m->argument, valid_modargs);
>-- 
>1.8.1.2
>

Actions: View | Splinter Review

Attachments on bug 62593: 76863

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.