Prepare agent for Tizen IVI

Add error message to the log. Copy agent service
file to weston target for IVI. Updated binary
directory as well

Change-Id: I3bcd7ee36bf25620ad6aa5cfefebd464e638b2a6
Signed-off-by: Imran Zaman <imran.zaman@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84740c1..28501fa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,8 @@ PROJECT(udisks-automount-agent)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}")
-SET(BINDIR "/usr/local/bin")
-SET(SYSTEMDDIR "/usr/lib/systemd")
+SET(BINDIR "/usr/bin")
+SET(SYSTEMDDIR "${SYSTEMD_SERVICE_DIR}")
 SET(POLKITRULESDIR "/etc/polkit-1/localauthority/10-vendor.d")
 
 SET(VERSION 0.0.1)
@@ -40,5 +40,5 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 
 # Install 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
-INSTALL(FILES udisks-automount-agent.service DESTINATION ${SYSTEMDDIR}/user)
+INSTALL(FILES udisks-automount-agent.service DESTINATION ${SYSTEMDDIR})
 INSTALL(FILES data/10-udisks.pkla DESTINATION ${POLKITRULESDIR})

diff --git a/data/udisks-automount-agent.service.in b/data/udisks-automount-agent.service.in
index 023b63e..01c25ff 100644 (file)
--- a/data/udisks-automount-agent.service.in
+++ b/data/udisks-automount-agent.service.in
@@ -2,9 +2,9 @@
 Description=Udisks user session automount/umount agent
 
 [Service]
-ExecStart=@udisksagentbindir@/udisks-automount-agent
 Type=simple
 Restart=always
 RestartSec=1
+ExecStart=@udisksagentbindir@/udisks-automount-agent
 Requires=udisks2.service
 Requires=org.freedesktop.PolicyKit1.service

diff --git a/packaging/udisks-automount-agent.spec b/packaging/udisks-automount-agent.spec
index e68c04a..a999473 100644 (file)
--- a/packaging/udisks-automount-agent.spec
+++ b/packaging/udisks-automount-agent.spec
@@ -1,3 +1,4 @@
+%bcond_with ivi
 Name:       udisks-automount-agent
 Summary:    Udisk automount agent
 Version:    0.1.0
@@ -18,9 +19,15 @@ Requires:      udisks
 %description
 TIZEN udisks automount sample agent.  
 
+%if %{with ivi}
+%define _target_name weston
+%else
+%define _target_name core-efl
+%endif
+
 %prep
 %setup -q
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} 
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DSYSTEMD_SERVICE_DIR=%{_unitdir_user} 
 
 %build
 make %{?jobs:-j%jobs}
@@ -28,14 +35,14 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}%{_prefix}/lib/systemd/user/core-efl.target.wants/
-ln -s ../udisks-automount-agent.service %{buildroot}/usr/lib/systemd/user/core-efl.target.wants/udisks-automount-agent.service
+mkdir -p %{buildroot}%{_unitdir_user}/%{_target_name}.target.wants/
+ln -s ../udisks-automount-agent.service %{buildroot}%{_unitdir_user}/%{_target_name}.target.wants/udisks-automount-agent.service
 
 %post
 
 %files
-%{_prefix}/local/bin/udisks-automount-agent
-%{_prefix}/lib/systemd/user/udisks-automount-agent.service
-%{_prefix}/lib/systemd/user/core-efl.target.wants/udisks-automount-agent.service
+%{_prefix}/bin/udisks-automount-agent
+%{_unitdir_user}/udisks-automount-agent.service
+%{_unitdir_user}/%{_target_name}.target.wants/udisks-automount-agent.service
 %{_sysconfdir}/polkit-1/localauthority/10-vendor.d/10-udisks.pkla
 %license LICENSE

diff --git a/src/udisk-agent.c b/src/udisk-agent.c
index e5040bf..8b864dc 100644 (file)
--- a/src/udisk-agent.c
+++ b/src/udisk-agent.c
@@ -176,7 +176,7 @@ static void automount_on_object_added(GDBusObjectManager  *manager, GDBusObject
        }
        else
        {
-               g_printerr( "Mount error, domain = %d, error code = %d\n", error -> domain, error -> code);
+               g_printerr( "Mount error, domain = %d, error code = %d, msg = %s\n", error -> domain, error -> code, error->message);
        }
 
        if (error != (GError *)NULL)