Change dbus auto activation bus name

- Currently, zb_create() registers dbus signal
  but it makes daemon activated.
- Change only 'enable' method can execute daemon.

Change-Id: I7bf25df517f2393d95af87c164ae9e69cecc389d
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/packaging/org.tizen.zigbee.service b/packaging/org.tizen.zigbee.service
index 7471288..129767e 100644 (file)
--- a/packaging/org.tizen.zigbee.service
+++ b/packaging/org.tizen.zigbee.service
@@ -1,5 +1,5 @@
 [D-BUS Service]
-Name=org.tizen.zigbee
+Name=org.tizen.zigbee.manager
 
 Exec=/bin/false
 User=system

diff --git a/packaging/zigbee-manager.spec b/packaging/zigbee-manager.spec
index 2082223..307bdc8 100644 (file)
--- a/packaging/zigbee-manager.spec
+++ b/packaging/zigbee-manager.spec
@@ -52,8 +52,9 @@ make %{?_smp_mflags}
 
 %make_install
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -s %{_libdir}/systemd/system/zigbee-daemon.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/zigbee-daemon.service
+# Do not execute daemon on boot time
+#mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+#ln -s %{_libdir}/systemd/system/zigbee-daemon.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/zigbee-daemon.service
 
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
 cp org.tizen.zigbee.service %{buildroot}%{_datadir}/dbus-1/system-services/org.tizen.zigbee.service
@@ -67,7 +68,7 @@ cp org.tizen.zigbee.service %{buildroot}%{_datadir}/dbus-1/system-services/org.t
 %defattr(644,system,system,-)
 %attr(755,system,system) %{_bindir}/zigbee-daemon
 %{_libdir}/systemd/system/zigbee-daemon.service
-%{_libdir}/systemd/system/multi-user.target.wants/zigbee-daemon.service
+#%{_libdir}/systemd/system/multi-user.target.wants/zigbee-daemon.service
 %{_datadir}/license/zigbee-daemon
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 

diff --git a/zigbee-daemon/resources/zigbee-daemon.service b/zigbee-daemon/resources/zigbee-daemon.service
index 242225d..5353556 100644 (file)
--- a/zigbee-daemon/resources/zigbee-daemon.service
+++ b/zigbee-daemon/resources/zigbee-daemon.service
@@ -5,7 +5,7 @@ After=dbus.socket
 
 [Service]
 Type=dbus
-BusName=org.tizen.zigbee
+BusName=org.tizen.zigbee.manager
 User=system
 Group=system
 SmackProcessLabel=System