Remove the obexd ps command

Change-Id: I1985aa236984de0bf0814b491e464cd417084ef3
Signed-off-by: Lee Hyuk <hyuk0512.lee@samsung.com>

diff --git a/bluez.manifest b/bluez.manifest
index d966cf5..75b0fa5 100644 (file)
--- a/bluez.manifest
+++ b/bluez.manifest
@@ -1,4 +1,4 @@
-fest>
+<manifest>
     <request>
         <domain name="_"/>
     </request>

diff --git a/obexd.manifest b/obexd.manifest
index 9d334de..371976f 100644 (file)
--- a/obexd.manifest
+++ b/obexd.manifest
@@ -1,29 +1,5 @@
 <manifest>
-    <define>
-        <domain name="obexd"/>
        <request>
-               <smack request="system::vconf" type="rwxat"/>
-               <smack request="system::share" type="rwxat"/>
-               <smack request="system::ext_storage" type="rwxat"/>
-               <smack request="system::media" type="rwxat"/>
-               <smack request="sys-assert::core" type="rwxat"/>
-               <smack request="ui-gadget::client" type="rwx"/>
-               <smack request="map-agent::dbus" type="rwxat"/>
-               <smack request="pb-agent::dbus" type="rwxat"/>
-               <smack request="dbus" type="rwx"/>
-               <smack request="syslogd" type="w"/>
-               <smack request="sysklogd" type="w"/>
-               <smack request="bluez" type="rw"/>
+        <domain name="_"/>
        </request>
-       <permit>
-               <smack permit="dbus" type="rwx"/>
-       </permit>
-    </define>
-    <assign>
-        <filesystem path="/usr/lib/obex/plugins/" label="_"/>
-        <filesystem path="/usr/share/dbus-1/services/org.bluez.obex.service" label="_"/>
-    </assign>
-    <request>
-        <domain name="obexd"/>
-    </request>
 </manifest>

diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
index 4acaac4..3abb555 100755 (executable)
--- 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 (file)
--- 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