Attachment 506916 Details for Bug 769570

[patch] Patch for upstream

0001-Fix-same-seat-detection-if-built-with-systemd-but-no.patch (text/plain), 1.72 KB, created by Vincent Untz on 2012-09-25 09:00:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent Untz

Created: 2012-09-25 09:00:03 UTC

Size: 1.72 KB

patch

obsolete

>From ce5a67127223e99ffdbf9cb697537c689e2fe364 Mon Sep 17 00:00:00 2001
>From: Vincent Untz <vuntz@gnome.org>
>Date: Tue, 25 Sep 2012 10:55:31 +0200
>Subject: [PATCH] Fix same seat detection if built with systemd, but not
> booted with it
>
>If we haven't booted with systemd, then we can only assume it's always
>the same seat.
>
>Based on patch by Takashi Iwai <tiwai@suse.com>.
>
>https://bugzilla.novell.com/show_bug.cgi?id=769570
>---
> configure.ac           |    2 +-
> src/udisksdaemonutil.c |    5 +++++
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/configure.ac b/configure.ac
>index 994fd1a..93c715e 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -145,7 +145,7 @@ AC_SUBST(LIBATASMART_CFLAGS)
> AC_SUBST(LIBATASMART_LIBS)
> 
> PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN,
>-                  [libsystemd-login >= 44],
>+                  [libsystemd-login >= 44 libsystemd-daemon],
>                   have_libsystemd_login=yes,
>                   have_libsystemd_login=no)
> AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes)
>diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c
>index ef925f5..69cd8a5 100644
>--- a/src/udisksdaemonutil.c
>+++ b/src/udisksdaemonutil.c
>@@ -42,6 +42,7 @@
> #include "udiskslinuxdriveobject.h"
> 
> #if defined(HAVE_LIBSYSTEMD_LOGIN)
>+#include <systemd/sd-daemon.h>
> #include <systemd/sd-login.h>
> #endif
> 
>@@ -1021,6 +1022,10 @@ udisks_daemon_util_on_same_seat (UDisksDaemon          *daemon,
>   UDisksObject *drive_object = NULL;
>   UDisksDrive *drive = NULL;
> 
>+  /* if we haven't booted with systemd, assume it's always the same seat */
>+  if (sd_booted () <= 0)
>+    return TRUE;
>+
>   if (UDISKS_IS_LINUX_BLOCK_OBJECT (object))
>     {
>       UDisksLinuxBlockObject *linux_block_object;
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 769570: 497050 | 506916