Change the smack label for update-* services

Change-Id: I97cab0128aeed3aeff2219f9208739a89df4f643

diff --git a/units/update-finalize.service b/units/update-finalize.service
index a98ce545cdfb77a7dce3624669e1544f1ccd9a98..2a059c6c9a807cb8c334d941672e3bd4a4b9d8f4 100644 (file)
--- a/units/update-finalize.service
+++ b/units/update-finalize.service
@@ -1,15 +1,12 @@
 [Unit]
 Description=Finalize OS update
 DefaultDependencies=no
-#Requisite=update-post.service default.target
-#After=update-post.service default.target system-delayed-target-done.service
-#IgnoreOnIsolate=true
 After=system-delayed-target-done.service
 ConditionKernelCommandLine=bootmode=fota
 
 [Service]
 Type=oneshot
-SmackProcessLabel=System::Privileged
+SmackProcessLabel=System
 ExecStart=/usr/share/upgrade/update-finalize.sh
 RemainAfterExit=true
 

diff --git a/units/update-post.service b/units/update-post.service
index 1c9ee29aa68273f55c281423e8a991ecf30575d6..67f958e2682b13d28a08d23928348ad87d7c1853 100644 (file)
--- a/units/update-post.service
+++ b/units/update-post.service
@@ -7,6 +7,6 @@ IgnoreOnIsolate=true
 
 [Service]
 Type=oneshot
-SmackProcessLabel=System::Privileged
+SmackProcessLabel=System
 ExecStart=/usr/share/upgrade/update-post.sh
 

diff --git a/upgrade/update-finalize.sh.in b/upgrade/update-finalize.sh.in
index 105a32c55973bdbe33d861fefd4b6a5b69e6faf5..7c47741bd327dc902c0aa324b3204aaf13723f64 100755 (executable)
--- a/upgrade/update-finalize.sh.in
+++ b/upgrade/update-finalize.sh.in
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-UPDATE_SCRIPT_DIR=@TZ_SYS_UPGRADE_SCRIPTS@
-UPDATE_DATA_DIR=/opt/data/update
-SDB_RULE=${UPDATE_DATA_DIR}/99-sdb-switch.rules
 
 RW_MACRO=@TZ_SYS_UPGRADE@/rw-update-macro.inc
 
@@ -15,9 +12,11 @@ else
        UPDATE_PREPARE_ERR=1
 fi
 
+# TOOD: check if system is stable
 if true; then
        COMMIT_CHANGES
 fi
 
+# TODO: Replace this by calling the appropriate commands
 touch /tmp/set_BOOTING_OK
 touch /tmp/booting_change_bootmode