From de757e7e891465b394a10bafdfe0dca407d46448 Mon Sep 17 00:00:00 2001
From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Fri, 21 Apr 2017 06:00:01 +0300
Subject: [PATCH] udisks: auto enable systemd service

MediaPlayer needs udisks to be running on startup to
detect media removal

Bug-AGL: SPEC-483
Change-Id: I57389d3af8f4d2600baa2b24d437646ed1c7414e
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
 .../udisks/files/org.freedesktop.UDisks.conf       | 32 ++++++++++++++++++++++
 recipes-support/udisks/files/udisks.service        | 11 ++++++++
 recipes-support/udisks/udisks_1.0.5.bbappend       | 14 ++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 recipes-support/udisks/files/org.freedesktop.UDisks.conf
 create mode 100644 recipes-support/udisks/files/udisks.service
 create mode 100644 recipes-support/udisks/udisks_1.0.5.bbappend

diff --git a/recipes-support/udisks/files/org.freedesktop.UDisks.conf b/recipes-support/udisks/files/org.freedesktop.UDisks.conf
new file mode 100644
index 000000000..0098b94e1
--- /dev/null
+++ b/recipes-support/udisks/files/org.freedesktop.UDisks.conf
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="org.freedesktop.UDisks"/>
+  </policy>
+
+  <policy context="default">
+    <allow send_destination="org.freedesktop.UDisks"/>
+
+    <allow send_destination="org.freedesktop.UDisks"
+	    send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.freedesktop.UDisks"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+    <allow send_destination="org.freedesktop.UDisks"
+           send_interface="org.freedesktop.UDisks"/>
+    <allow send_destination="org.freedesktop.UDisks"
+           send_interface="org.freedesktop.UDisks.Device"/>
+    <allow send_destination="org.freedesktop.UDisks"
+           send_interface="org.freedesktop.UDisks.Adapter"/>
+    <allow send_destination="org.freedesktop.UDisks"
+           send_interface="org.freedesktop.UDisks.Expander"/>
+    <allow send_destination="org.freedesktop.UDisks"
+	    send_interface="org.freedesktop.UDisks.Port"/>
+    <allow receive_sender="org.freedesktop.UDisks" receive_type="signal"
+           receive_interface="org.freedesktop.UDisks"/>
+  </policy>
+</busconfig>
diff --git a/recipes-support/udisks/files/udisks.service b/recipes-support/udisks/files/udisks.service
new file mode 100644
index 000000000..75df55b3e
--- /dev/null
+++ b/recipes-support/udisks/files/udisks.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Disk Manager (legacy version)
+Documentation=man:udisks(7)
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.UDisks
+ExecStart=/usr/libexec/udisks-daemon --no-debug
+
+[Install]
+WantedBy=default.target
diff --git a/recipes-support/udisks/udisks_1.0.5.bbappend b/recipes-support/udisks/udisks_1.0.5.bbappend
new file mode 100644
index 000000000..2c6b11cc8
--- /dev/null
+++ b/recipes-support/udisks/udisks_1.0.5.bbappend
@@ -0,0 +1,14 @@
+SRC_URI += "file://org.freedesktop.UDisks.conf \
+            file://udisks.service \
+           "
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SYSTEMD_AUTO_ENABLE = "enable"
+
+do_install_append () {
+    install -d ${D}${sysconfdir}/dbus-1/system.d
+    install -m 644 ${WORKDIR}/org.freedesktop.UDisks.conf ${D}${sysconfdir}/dbus-1/system.d/
+
+    install -d ${D}${base_libdir}/systemd/system
+    install -m 0644 ${WORKDIR}/udisks.service ${D}${base_libdir}/systemd/system
+}
-- 
2.16.6