From 88f81b197242d6c436cee8d3ba2bb7bebf447900 Mon Sep 17 00:00:00 2001 From: Lee Hyuk Date: Wed, 23 Nov 2016 10:39:42 +0900 Subject: [PATCH] Remove the obexd ps command Change-Id: I1985aa236984de0bf0814b491e464cd417084ef3 Signed-off-by: Lee Hyuk --- bluez.manifest | 2 +- obexd.manifest | 26 +------------------------- obexd/src/org.bluez.obex.service | 2 +- packaging/bluez.spec | 1 + 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/bluez.manifest b/bluez.manifest index d966cf5..75b0fa5 100644 --- a/bluez.manifest +++ b/bluez.manifest @@ -1,4 +1,4 @@ -fest> + diff --git a/obexd.manifest b/obexd.manifest index 9d334de..371976f 100644 --- a/obexd.manifest +++ b/obexd.manifest @@ -1,29 +1,5 @@ - - - - - - - - - - - - - - + - - - - - - - - - - - diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service index 4acaac4..3abb555 100755 --- a/obexd/src/org.bluez.obex.service +++ b/obexd/src/org.bluez.obex.service @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.bluez.obex -Exec=/bin/sh -c 'if [ -z `ps ax | grep -v grep | grep obexd` ] ; then exec /usr/libexec/bluetooth/obexd -d --noplugin=ftp,syncevolution,pcsuite,irmc --symlinks -r /opt/usr/home/owner/media/; fi' +Exec=/bin/sh -c 'exec /usr/libexec/bluetooth/obexd -d --noplugin=ftp,syncevolution,pcsuite,irmc --symlinks -r /opt/usr/home/owner/media/' diff --git a/packaging/bluez.spec b/packaging/bluez.spec index 0b4924c..adcb7ea 100644 --- a/packaging/bluez.spec +++ b/packaging/bluez.spec @@ -266,6 +266,7 @@ cp -f packaging/bluetoothd_upgrade.sh %{buildroot}%{upgrade_script_path} %license COPYING %files -n obexd +%manifest %{name}.manifest %defattr(-,root,root,-) %{_libexecdir}/bluetooth/obexd %{_libpath}/systemd/user/obex.service -- 2.7.4