Commit 21505a74 authored by topjohnwu's avatar topjohnwu Committed by John Wu

Update scripts for PATCHVBMETAFLAG

parent ba6e6cc1
...@@ -179,12 +179,6 @@ check_encryption() { ...@@ -179,12 +179,6 @@ check_encryption() {
fi fi
} }
check_vbmeta_partition() {
if [ -e /dev/block/by-name/vbmeta_a ] || [ -e /dev/block/by-name/vbmeta ]; then
VBMETAEXIST=true
fi
}
########################## ##########################
# Non-root util_functions # Non-root util_functions
########################## ##########################
...@@ -199,6 +193,14 @@ get_flags() { ...@@ -199,6 +193,14 @@ get_flags() {
KEEPVERITY=$SYSTEM_ROOT KEEPVERITY=$SYSTEM_ROOT
[ "$(getprop ro.crypto.state)" = "encrypted" ] && ISENCRYPTED=true || ISENCRYPTED=false [ "$(getprop ro.crypto.state)" = "encrypted" ] && ISENCRYPTED=true || ISENCRYPTED=false
KEEPFORCEENCRYPT=$ISENCRYPTED KEEPFORCEENCRYPT=$ISENCRYPTED
# Although this most certainly won't work without root, keep it just in case
if [ -e /dev/block/by-name/vbmeta_a ] || [ -e /dev/block/by-name/vbmeta ]; then
VBMETAEXIST=true
else
VBMETAEXIST=false
fi
# Preset PATCHVBMETAFLAG to false in the non-root case
PATCHVBMETAFLAG=false
# Do NOT preset RECOVERYMODE here # Do NOT preset RECOVERYMODE here
} }
...@@ -217,7 +219,6 @@ app_init() { ...@@ -217,7 +219,6 @@ app_init() {
SHA1=$(grep_prop SHA1 $MAGISKTMP/config) SHA1=$(grep_prop SHA1 $MAGISKTMP/config)
check_boot_ramdisk && RAMDISKEXIST=true || RAMDISKEXIST=false check_boot_ramdisk && RAMDISKEXIST=true || RAMDISKEXIST=false
check_encryption check_encryption
check_vbmeta_partition
# Make sure RECOVERYMODE has value # Make sure RECOVERYMODE has value
[ -z $RECOVERYMODE ] && RECOVERYMODE=false [ -z $RECOVERYMODE ] && RECOVERYMODE=false
} }
......
...@@ -377,8 +377,10 @@ umount_apex() { ...@@ -377,8 +377,10 @@ umount_apex() {
unset BOOTCLASSPATH unset BOOTCLASSPATH
} }
# After calling this method, the following variables will be set:
# KEEPVERITY, KEEPFORCEENCRYPT, RECOVERYMODE, PATCHVBMETAFLAG,
# ISENCRYPTED, VBMETAEXIST
get_flags() { get_flags() {
# override variables
getvar KEEPVERITY getvar KEEPVERITY
getvar KEEPFORCEENCRYPT getvar KEEPFORCEENCRYPT
getvar RECOVERYMODE getvar RECOVERYMODE
...@@ -403,12 +405,15 @@ get_flags() { ...@@ -403,12 +405,15 @@ get_flags() {
KEEPFORCEENCRYPT=false KEEPFORCEENCRYPT=false
fi fi
fi fi
VBMETAEXIST=false
local VBMETAIMG=$(find_block vbmeta vbmeta_a)
[ -n "$VBMETAIMG" ] && VBMETAEXIST=true
if [ -z $PATCHVBMETAFLAG ]; then if [ -z $PATCHVBMETAFLAG ]; then
if [ -e /dev/block/by-name/vbmeta_a ] || [ -e /dev/block/by-name/vbmeta ]; then if $VBMETAEXIST; then
PATCHVBMETAFLAG=false PATCHVBMETAFLAG=false
else else
PATCHVBMETAFLAG=true PATCHVBMETAFLAG=true
ui_print "- Not found vbmeta partition, patch vbmetaflag" ui_print "- Cannot find vbmeta partition, patch vbmeta in boot image"
fi fi
fi fi
[ -z $RECOVERYMODE ] && RECOVERYMODE=false [ -z $RECOVERYMODE ] && RECOVERYMODE=false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment