summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoHyun Pyun <dh79.pyun@samsung.com>2016-08-31 17:19:01 +0900
committerDoHyun Pyun <dh79.pyun@samsung.com>2016-08-31 17:19:01 +0900
commite931e2a758cf3c3073adeff017efdfad1154f130 (patch)
treef7ffd425e3d7e16124caa6efdb297187a3d071e5
parentf6874783e87775f7857940a922406bd3d586c0e2 (diff)
downloadbluez-e931e2a758cf3c3073adeff017efdfad1154f130.tar.gz
bluez-e931e2a758cf3c3073adeff017efdfad1154f130.tar.bz2
bluez-e931e2a758cf3c3073adeff017efdfad1154f130.zip
Change-Id: I65dc2d03384c0d53b625b049f54ffa7be41fd06c Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
-rw-r--r--packaging/bluez.spec4
-rw-r--r--src/bluetooth.service.in7
2 files changed, 6 insertions, 5 deletions
diff --git a/packaging/bluez.spec b/packaging/bluez.spec
index 6dfb4819..95d4a28e 100644
--- 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 525a3c12..e00095d7 100644
--- 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