Use /run/upgrade-sysroot instead of /system

Change-Id: I1b781134eafc29b07d0e6410407c665e3bd911df

diff --git a/scripts/upgrade-fota.sh b/scripts/upgrade-fota.sh
index 024314d..21bb13e 100644 (file)
--- a/scripts/upgrade-fota.sh
+++ b/scripts/upgrade-fota.sh
@@ -6,7 +6,7 @@ set -o errtrace -e -o pipefail
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 
-FOTA_UPDATE_PREFIX="/system"
+FOTA_UPDATE_PREFIX="/run/upgrade-sysroot"
 VERSION_FILE="$FOTA_UPDATE_PREFIX/opt/etc/version"
 DO_RW_UPDATE_FILE="$FOTA_UPDATE_PREFIX/opt/.do_rw_update"
 
@@ -151,6 +151,11 @@ reboot_to_fota() {
        fi
 }
 
+prepare_fota_update_dir() {
+       mkdir -p ${FOTA_UPDATE_PREFIX}
+}
+
+prepare_fota_update_dir
 check_ab_partition_scheme
 check_used_block_device
 if ! mount; then

diff --git a/scripts/upgrade-partial.sh b/scripts/upgrade-partial.sh
index 212a7df..0e4c296 100644 (file)
--- a/scripts/upgrade-partial.sh
+++ b/scripts/upgrade-partial.sh
@@ -153,7 +153,7 @@ upgrade_images() {
        done < "$FOTA_DIR/$CONFIG_FILE"
 }
 
-FOTA_UPDATE_PREFIX="/system"
+FOTA_UPDATE_PREFIX="/run/upgrade-sysroot"
 
 mount_partition() {
        GPT_LABEL="$1"
@@ -256,6 +256,11 @@ run_ro_update() {
        return 0
 }
 
+prepare_fota_update_dir() {
+       mkdir -p ${FOTA_UPDATE_PREFIX}
+}
+
+prepare_fota_update_dir
 check_ab_partition_scheme
 check_used_block_device
 check_args "$@"