summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyoungJune Park <mj2004.park@samsung.com>2017-10-17 13:38:43 +0900
committerMyoungJune Park <mj2004.park@samsung.com>2017-10-17 13:38:57 +0900
commita0bf306a9579a9a63f62088558a3195be3b2ec44 (patch)
treeb8c5e07e0f4023477d53e421d9c3dbdf804a41b8
parentff07c4f457dc02035ff6c1385ef4004d64622d86 (diff)
parente67b9263b34e6e37b0a681bd97246ce1bff1a922 (diff)
downloadfactory-reset-submit/tizen_4.0/20171017.043938.tar.gz
factory-reset-submit/tizen_4.0/20171017.043938.tar.bz2
factory-reset-submit/tizen_4.0/20171017.043938.zip
Change-Id: I90d928204c78968c115f4f6c6737451f8abf46d0 Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>
-rw-r--r--factory-reset.manifest22
-rw-r--r--packaging/factory-reset.service4
-rwxr-xr-xscript/run-factory-reset.sh2
3 files changed, 7 insertions, 21 deletions
diff --git a/factory-reset.manifest b/factory-reset.manifest
index 50e0dcd..017d22d 100644
--- 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 7c4d371..bc51fab 100644
--- a/packaging/factory-reset.service
+++ b/packaging/factory-reset.service
@@ -1,12 +1,14 @@
[Unit]
Description=factory reset on booting
Before=tizen-boot.target
-
ConditionPathExists=|/opt/.factoryreset
[Service]
Type=oneshot
ExecStart=/usr/bin/factory-reset
+SmackProcessLabel=System
[Install]
WantedBy=multi-user.target
+
+
diff --git a/script/run-factory-reset.sh b/script/run-factory-reset.sh
index c2d1f54..800a413 100755
--- 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