diff options
| author | Pyun DoHyun <dh79.pyun@samsung.com> | 2019-09-23 08:53:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2019-09-23 08:53:52 +0000 |
| commit | 3df7e25283a7597b3ea5076df9b3bcb4a8f361b9 (patch) | |
| tree | ad91e2f7c71f8b82f8e096e2470da217c9b73fb8 | |
| parent | d5e2c186af2187e7f71bae0d30854f15a70c2b08 (diff) | |
| parent | 1323581289ee3d3f72c912bf04d0662abae77d5b (diff) | |
| download | bluez-accepted/tizen_5.5_unified_mobile_hotfix.tar.gz bluez-accepted/tizen_5.5_unified_mobile_hotfix.tar.bz2 bluez-accepted/tizen_5.5_unified_mobile_hotfix.zip | |
Merge "Use the systemd service for obexd" into tizentizen_5.5.m2_releasesubmit/tizen_5.5_mobile_hotfix/20201026.185106submit/tizen_5.5/20191031.000006submit/tizen/20190923.085748accepted/tizen/unified/20190924.062104accepted/tizen/5.5/unified/mobile/hotfix/20201027.061849accepted/tizen/5.5/unified/20191031.004956tizen_5.5_mobile_hotfixaccepted/tizen_5.5_unified_mobile_hotfix
| -rwxr-xr-x | obexd/src/obex.service.in | 3 | ||||
| -rwxr-xr-x | obexd/src/org.bluez.obex.service | 4 | ||||
| -rwxr-xr-x | packaging/bluez.spec | 4 |
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 |