From ffda68f5e31bcda8bba80cef332713e9443e587e5302b7f2937813f4f623e029 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 25 Sep 2012 09:12:42 +0000
Subject: [PATCH] Accepting request 127057 from home:tiwai:branches:Base:System

- Add a check of running systemd (bnc#769570)

OBS-URL: https://build.opensuse.org/request/show/127057
OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=12
---
 systemd-dynamic-check.diff | 20 ++++++++++++++++++++
 udisks2.changes            |  5 +++++
 udisks2.spec               |  3 +++
 3 files changed, 28 insertions(+)
 create mode 100644 systemd-dynamic-check.diff

diff --git a/systemd-dynamic-check.diff b/systemd-dynamic-check.diff
new file mode 100644
index 0000000..944f537
--- /dev/null
+++ b/systemd-dynamic-check.diff
@@ -0,0 +1,20 @@
+---
+ src/udisksdaemonutil.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/src/udisksdaemonutil.c
++++ b/src/udisksdaemonutil.c
+@@ -899,7 +899,12 @@ udisks_daemon_util_on_same_seat (UDisksD
+ 
+   /* 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;
++    }
+ 
+   drive_seat = udisks_drive_get_seat (drive);
+   if (g_strcmp0 (seat, drive_seat) == 0)
diff --git a/udisks2.changes b/udisks2.changes
index 4565ef7..31bb590 100644
--- a/udisks2.changes
+++ b/udisks2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  3 15:39:33 CEST 2012 - tiwai@suse.de
+
+- Add a check of running systemd (bnc#769570)
+
 -------------------------------------------------------------------
 Tue Jun 26 18:18:09 UTC 2012 - gber@opensuse.org
 
diff --git a/udisks2.spec b/udisks2.spec
index ebc6c91..4d99e31 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -27,6 +27,8 @@ 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
+Patch1:         systemd-dynamic-check.diff
 # Needed to build the man pages
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gobject-introspection-devel
@@ -92,6 +94,7 @@ for managing disks and storage devices.
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 export V=1