update smack privilege

- System -> System::Privileged
- update manifest file

Change-Id: If4739623d5150a5fac1355245b5bc19914c52b36
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

diff --git a/factory-reset.manifest b/factory-reset.manifest
index 50e0dcd25c33e86f4e4768c5199469956451615b..017d22d3aff3db1cd32736351140c2fed580d1c0 100644 (file)
--- a/factory-reset.manifest
+++ b/factory-reset.manifest
@@ -1,21 +1,5 @@
 <manifest>
-       <define>
-               <domain name="factory-reset"/>
-       </define>
-
-       <assign>
-               <filesystem path="/opt/etc/dump.d/module.d/dump-frlog.sh" label="_" exec_label="none" />
-               <filesystem path="/usr/share/dbus-1/services/org.tizen.factory-reset.service" label="_" exec_label="none" />
-               <dbus name="org.tizen.factoryreset" own="factory-reset" bus="system">
-                       <node name="/org/tizen/factoryreset">
-                               <interface name="org.tizen.factoryreset.start">
-                                       <annotation name="com.tizen.smack" value="factory-reset" />
-                               </interface>
-                       </node>
-               </dbus>
-       </assign>
-
-       <request>
-               <domain name="factory-reset"/>
-       </request>
+ <request>
+    <domain name="_"/>
+ </request>
 </manifest>

diff --git a/packaging/factory-reset.service b/packaging/factory-reset.service
index ad9bddce7cda9fe64ee477773118ca181fd2ef07..6a71472b22127b507eaa24440f695a73ad6a2b11 100644 (file)
--- a/packaging/factory-reset.service
+++ b/packaging/factory-reset.service
@@ -6,7 +6,7 @@ ConditionPathExists=|/opt/.factoryreset
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/factory-reset
-SmackProcessLabel=System
+SmackProcessLabel=System::Privileged
 User=system_fw
 Group=system_fw
 SmackProcessLabel=System

diff --git a/script/run-factory-reset.sh b/script/run-factory-reset.sh
index c2d1f5455e7836bad0db6589dccb1401ae54fd62..800a413a770713b41bb88ee6a80ff444e3e1b6f9 100755 (executable)
--- a/script/run-factory-reset.sh
+++ b/script/run-factory-reset.sh
@@ -289,7 +289,7 @@ if [ -r $cnt_file ]; then
        echo $reset_cnt > $cnt_file
 else
        echo 1 > $cnt_file
-       /usr/bin/chsmack -a "*" $cnt_file
+#      /usr/bin/chsmack -a "*" $cnt_file
        /bin/chmod 644 $cnt_file
 fi