Fix upgrade script

- Change condition to determine preload pkg for readonlyupdateinstall case.
- Change smack label of RO files to backend handle it if label doesn't changed
  due to unexpected FOTA failure.

Change-Id: I17de6f09888064053e93a3f784bfb8fb9068e9c2
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/data/700.pkgmgr.patch.sh.in b/data/700.pkgmgr.patch.sh.in
index 7020e25ce90e61b5f06cb81ae8ba0e012f7d44c1..e897907ad25b8dea8ff2b2819dede647fe03d3a1 100644 (file)
--- a/data/700.pkgmgr.patch.sh.in
+++ b/data/700.pkgmgr.patch.sh.in
@@ -35,7 +35,7 @@ DEFAULT_PKG_APP_LOCATION=$TZ_SYS_RW_APP
 
 
 DEFAULT_RO_OWNER_GROUP=tizenglobalapp:root
-DEFAULT_MANIFEST_SMACK_LABEL=System
+DEFAULT_SMACK_LABEL=System
 
 DEFAULT_RW_OWNER_GROUP=owner:users
 DEFAULT_RW_SMACK_LABEL=User::Pkg::
@@ -112,6 +112,8 @@ function move_user_tpk_ro_files(){
        if [ -e "$DEFAULT_PKG_APP_LOCATION/$package/shared/trusted" ]; then
                rm -r "$DEFAULT_PKG_APP_LOCATION/$package/shared/trusted"
        fi
+
+       chsmack -r -a $DEFAULT_SMACK_LABEL $DEFAULT_PKG_APP_LOCATION/$package/*
 }
 
 function move_user_tpk_rw_files(){
@@ -189,6 +191,8 @@ function move_user_wgt_ro_files(){
        if [ -e "$DEFAULT_PKG_APP_LOCATION/$package/shared/trusted" ]; then
                rm -r "$DEFAULT_PKG_APP_LOCATION/$package/shared/trusted"
        fi
+
+       chsmack -r -a $DEFAULT_SMACK_LABEL $DEFAULT_PKG_APP_LOCATION/$package/*
 }
 
 function move_user_wgt_rw_files(){
@@ -267,7 +271,7 @@ function remove_files_for_deleted_packages(){
 function move_preload_pkg_userdata(){
        echo "#move preload pkg's userdata"
        echo "ATTACH DATABASE '$PARSER_BACKUP_DB_PATH' AS backup;
-           SELECT package FROM backup.package_info WHERE package_readonly='true' COLLATE NOCASE AND
+           SELECT package FROM backup.package_info WHERE package_system='true' COLLATE NOCASE AND
            package IN (SELECT package FROM package_info);" |
        sqlite3 $PARSER_DB_PATH > $DB_RESULT_FILE
        while read package