Update upgrade script

* Dyntransition file('apps_name') was renamed to 'apps_labels'
* systemctl command is not working on migration.
  Just launch cynara and security-manager manually.

Change-Id: Ifaf6121e8c924f9212ebed4187132730b20ce02b
Signed-off-by: jooseong lee <jooseong.lee@samsung.com>

diff --git a/upgrade/011.security_upgrade.sh b/upgrade/011.security_upgrade.sh
index f42dcef38500c57043c01eba4695e4dd3515acee..dc7dc78dcc97f5f648e6eea9075eaa51a5e84f3c 100644 (file)
--- a/upgrade/011.security_upgrade.sh
+++ b/upgrade/011.security_upgrade.sh
@@ -64,15 +64,15 @@ mkdir $SECURITY_MANAGER_DIR
 mkdir $SECURITY_MANAGER_DIR/owner
 mkdir $SECURITY_MANAGER_DIR/rules
 mkdir $SECURITY_MANAGER_DIR/rules-merged
-touch $SECURITY_MANAGER_DIR/apps-names
-touch $SECURITY_MANAGER_DIR/owner/apps-names
+touch $SECURITY_MANAGER_DIR/apps-labels
+touch $SECURITY_MANAGER_DIR/owner/apps-labels
 touch $SECURITY_MANAGER_DIR/rules-merged/rules.merged
 chmod 711 $SECURITY_MANAGER_DIR
 chmod 711 $SECURITY_MANAGER_DIR/owner
 chmod 700 $SECURITY_MANAGER_DIR/rules
 chmod 700 $SECURITY_MANAGER_DIR/rules-merged
-chmod 444 $SECURITY_MANAGER_DIR/apps-names
-chmod 444 $SECURITY_MANAGER_DIR/owner/apps-names
+chmod 444 $SECURITY_MANAGER_DIR/apps-labels
+chmod 444 $SECURITY_MANAGER_DIR/owner/apps-labels
 chmod 644 $SECURITY_MANAGER_DIR/rules-merged/rules.merged
 
 find $SECURITY_MANAGER_DIR -exec chown root:root {} +
@@ -97,6 +97,5 @@ chsmack -a System $SECURITY_MANAGER_DB_JOURNAL
 /usr/share/security-config/set_label
 
 # restart services
-systemctl restart security-manager.service
-systemctl reset-failed cynara.service
-systemctl restart cynara.service
+/usr/bin/security-manager &
+/usr/bin/cynara &