Modify bluetooth.service file for XU3

Change-Id: I65dc2d03384c0d53b625b049f54ffa7be41fd06c
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/packaging/bluez.spec b/packaging/bluez.spec
index 6dfb481..95d4a28 100644 (file)
--- a/packaging/bluez.spec
+++ b/packaging/bluez.spec
@@ -189,7 +189,9 @@ install -D -m 0755 tools/obexctl %{buildroot}%{_bindir}/obexctl
 
 #test
 %if "%{?profile}" == "tv"
+mkdir -p %{buildroot}%{_libpath}/systemd/system/multi-user.target.wants/
 ln -sf bluetooth.service %{buildroot}%{_libpath}/systemd/system/dbus-org.bluez.service
+ln -sf ../bluetooth-frwk.service %{buildroot}%{_libpath}/systemd/system/multi-user.target.wants/bluetooth.service
 %endif
 
 %post -n libbluetooth -p /sbin/ldconfig
@@ -226,10 +228,12 @@ ln -sf bluetooth.service %{buildroot}%{_libpath}/systemd/system/dbus-org.bluez.s
 #test -2
 %if "%{?profile}" == "tv"
 %{_libpath}/systemd/system/bluetooth.service
+%{_libpath}/systemd/system/multi-user.target.wants/bluetooth.service
 %{_libpath}/systemd/system/dbus-org.bluez.service
 %{_datadir}/dbus-1/system-services/org.bluez.service
 %else
 %exclude /%{_libpath}/systemd/system/bluetooth.service
+%exclude %{_libpath}/systemd/system/multi-user.target.wants/bluetooth.service
 %exclude /%{_datadir}/dbus-1/system-services/org.bluez.service
 %endif
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf

diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
index 525a3c1..e00095d 100644 (file)
--- a/src/bluetooth.service.in
+++ b/src/bluetooth.service.in
@@ -5,14 +5,11 @@ Documentation=man:bluetoothd(8)
 [Service]
 Type=dbus
 BusName=org.bluez
-ExecStart=@libexecdir@/bluetoothd -nEd
+ExecStart=/usr/libexec/bluetooth/bluetoothd -d -C
 NotifyAccess=main
-#WatchdogSec=10
-#Restart=on-failure
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
 LimitNPROC=1
-SmackExecLabel=User
 
 [Install]
-WantedBy=bluetooth.target
+WantedBy=multi-user.target
 Alias=dbus-org.bluez.service