Add dbus activation

Some services like msg-server calls callmgr's dbus method
before callmgr.service is ready. It will be handled by
dbus activation.

Change-Id: Ic034e85e56759803d050d581df7403a447085156
Signed-off-by: Semun Lee <semun.lee@samsung.com>

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index 59b95c3670ca2e63c613f11de8e054ed7a58550a..666bc3d1118149361224375aef591fe33a0fe64a 100644 (file)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -79,6 +79,7 @@ export LDFLAGS+=" -Wl,-z,nodelete "
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=%{version} \
 -DLIB_INSTALL_DIR=%{_libdir} \
 -DUNIT_INSTALL_DIR=%{_unitdir} \
+-DDBUS_SERVICE_DIR=%{_datadir}/dbus-1/system-services \
 -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
 %if 0%{?ext_feature}
 -D_ENABLE_EXT_FEATURE:BOOL=ON \
@@ -109,6 +110,7 @@ cp %{SOURCE1} %{buildroot}/etc/dbus-1/system.d/callmgr.conf
 %{_unitdir}/callmgr.service
 %{_unitdir}/multi-user.target.wants/callmgr.service
 /etc/dbus-1/system.d/callmgr.conf
+%{_datadir}/dbus-1/system-services/org.tizen.callmgr.service
 %license LICENSE
 /usr/share/call-manager/*
 

diff --git a/resource/callmgr.service b/resource/callmgr.service
index cbd1c1ffaac504d92a337640939bc314670bee5c..d9cbaa5ee5a45d7ebbaede34b065f8d945765729 100644 (file)
--- a/resource/callmgr.service
+++ b/resource/callmgr.service
@@ -6,6 +6,8 @@ After=tizen-runtime.target telephony-daemon.service contacts-service.service pul
 User=telephony
 Group=telephony
 SmackProcessLabel=System
+Type=dbus
+BusName=org.tizen.callmgr
 ExecStart=/usr/bin/callmgrd
 Restart=on-failure
 RestartSec=0

diff --git a/resource/org.tizen.callmgr.service b/resource/org.tizen.callmgr.service
new file mode 100644 (file)
index 0000000..d08703b
--- /dev/null
+++ b/resource/org.tizen.callmgr.service
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.tizen.callmgr
+Exec=/bin/false
+User=telephony
+SystemdService=callmgr.service

diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index 1c47a242f9da824334b11ca042daea30287d1e9e..deb0829383907d08c447761101d2d3659d77bd9d 100644 (file)
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -49,3 +49,4 @@ INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 
 # Configuration files (dbus & smack)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/callmgr.service DESTINATION ${UNITDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/org.tizen.callmgr.service DESTINATION ${DBUS_SERVICE_DIR})