summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xobexd/src/obex.service.in3
-rwxr-xr-xobexd/src/org.bluez.obex.service4
-rwxr-xr-xpackaging/bluez.spec4
3 files changed, 7 insertions, 4 deletions
diff --git a/obexd/src/obex.service.in b/obexd/src/obex.service.in
index cfa059a2..2c110aa8 100755
--- a/obexd/src/obex.service.in
+++ b/obexd/src/obex.service.in
@@ -4,10 +4,11 @@ Description=Bluetooth OBEX service
[Service]
User=network_fw
Group=network_fw
+SmackProcessLabel=System
SupplementaryGroups=priv_mediastorage priv_externalstorage
Type=dbus
BusName=org.bluez.obex
-ExecStart=@libexecdir@/obexd
+ExecStart=@libexecdir@/obexd -d --noplugin=ftp,syncevolution,pcsuite,irmc --symlinks -r /opt/usr/home/owner/media/
[Install]
Alias=dbus-org.bluez.obex.service
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
index 132b0cdb..c3917e41 100755
--- a/obexd/src/org.bluez.obex.service
+++ b/obexd/src/org.bluez.obex.service
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.bluez.obex
-Exec=/bin/sh -c 'exec /usr/libexec/bluetooth/obexd -d --noplugin=ftp,syncevolution,pcsuite,irmc --symlinks -r /opt/usr/home/owner/media/'
-User=network_fw
+Exec=/bin/false
+SystemdService=obex.service
diff --git a/packaging/bluez.spec b/packaging/bluez.spec
index 218ec3c8..087aa255 100755
--- a/packaging/bluez.spec
+++ b/packaging/bluez.spec
@@ -399,6 +399,8 @@ ln -sf bluetooth.service %{buildroot}%{_libpath}/systemd/system/dbus-org.bluez.s
ln -sf ../bluetooth.service %{buildroot}%{_libpath}/systemd/system/multi-user.target.wants/bluetooth.service
#endif
+install -D -m 0644 obexd/src/obex.service %{buildroot}%{_libpath}/systemd/system/
+
%post -n libbluetooth -p /sbin/ldconfig
%postun -n libbluetooth -p /sbin/ldconfig
@@ -482,7 +484,7 @@ popd
%manifest %{name}.manifest
%defattr(-,root,root,-)
%{_libexecdir}/bluetooth/obexd
-%exclude %{_libpath}/systemd/system/obex.service
+%{_libpath}/systemd/system/obex.service
%{_datadir}/dbus-1/system-services/org.bluez.obex.service
#%{_sysconfdir}/obex/root-setup.d/000_create-symlinks
#%{_bindir}/obex-root-setup