pool/udisks2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 135840 from home:vuntz:branches:Base:System

Browse Source 
Update patch with the one sent upstream

OBS-URL: https://build.opensuse.org/request/show/135840
OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=13
This commit is contained in:
Vincent Untz 2012-09-25 09:19:16 +00:00 committed by Git OBS Bridge
parent ffda68f5e3
commit c2b5d3b833
3 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
systemd-dynamic-check.diff
View File

@ -1,20 +1,49 @@
---
src/udisksdaemonutil.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit ce5a67127223e99ffdbf9cb697537c689e2fe364
Author: Vincent Untz <vuntz@gnome.org>
Date: Tue Sep 25 10:55:31 2012 +0200
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
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
@@ -899,7 +899,12 @@ udisks_daemon_util_on_same_seat (UDisksD
@@ -42,6 +42,7 @@
#include "udiskslinuxdriveobject.h"
/* If we don't know the seat of the caller, we assume the device is always on another seat */
if (seat == NULL)
- goto out;
+ {
+ /* no systemd running? */
+ if (access("/sys/fs/cgroup/systemd", R_OK))
+ ret = TRUE;
+ goto out;
+ }
#if defined(HAVE_LIBSYSTEMD_LOGIN)
+#include <systemd/sd-daemon.h>
#include <systemd/sd-login.h>
#endif
drive_seat = udisks_drive_get_seat (drive);
if (g_strcmp0 (seat, drive_seat) == 0)
@@ -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;

10
udisks2.changes
View File

@ -1,7 +1,15 @@
-------------------------------------------------------------------
Tue Sep 25 09:14:34 UTC 2012 - vuntz@opensuse.org
- Update systemd-dynamic-check.diff with patch sent upstream.
- Add gnome-common BuildRequires and call to gnome-autogen.sh, as
needed by the patch now.
-------------------------------------------------------------------
Tue Jul 3 15:39:33 CEST 2012 - tiwai@suse.de
- Add a check of running systemd (bnc#769570)
- Add systemd-dynamic-check.diff: add a check of running systemd
(bnc#769570)
-------------------------------------------------------------------
Tue Jun 26 18:18:09 UTC 2012 - gber@opensuse.org

6
udisks2.spec
View File

@ -27,10 +27,12 @@ Url: http://www.freedesktop.org/wiki/Software/udisks
Source: http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM udisks-hide-lvm-raid-partitions.patch fdo#51439 bnc#737038 gber@opensuse.org -- Hide partitions marked as containing LVM and RAID. This is only useful for encrypted partitions.
Patch0: udisks-hide-lvm-raid-partitions.patch
# PATCH-FIX-OPENSUSE systemd-dynamic-check.diff bnc#769570 tiwai@suse.de -- Add a check of running systemd so that it still works with sysvinit
# PATCH-FIX-UPSTREAM systemd-dynamic-check.diff fdo#55309 bnc#769570 tiwai@suse.de -- Add a check of running systemd so that it still works with sysvinit
Patch1: systemd-dynamic-check.diff
# Needed to build the man pages
BuildRequires: docbook-xsl-stylesheets
# needed for patch1
BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
BuildRequires: libacl-devel
@ -98,6 +100,8 @@ for managing disks and storage devices.
%build
export V=1
# needed for patch1
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--disable-static
make %{?_smp_mflags}