TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-08-21 10:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep dm/avb-verity when device is using system_root_image

Browse Source 
Close #512
This commit is contained in:
topjohnwu
2018-08-29 00:40:14 -04:00
parent 8664e9d19b
commit 70d3b24338
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/util_functions.sh
View File

@@ -98,7 +98,6 @@ mount_partitions() {
mount --move /system /system_root mount --move /system /system_root
mount -o bind /system_root/system /system mount -o bind /system_root/system /system
fi fi
$SYSTEM_ROOT && ui_print "- Device using system_root_image"
if [ -L /system/vendor ]; then if [ -L /system/vendor ]; then
# Seperate /vendor partition # Seperate /vendor partition
is_mounted /vendor || mount -o ro /vendor 2>/dev/null is_mounted /vendor || mount -o ro /vendor 2>/dev/null
@@ -114,17 +113,13 @@ get_flags() {
# override variables # override variables
getvar KEEPVERITY getvar KEEPVERITY
getvar KEEPFORCEENCRYPT getvar KEEPFORCEENCRYPT
HIGHCOMP=false
if [ -z $KEEPVERITY ]; then if [ -z $KEEPVERITY ]; then
KEEPVERITY=false if $SYSTEM_ROOT; then
hardware=`grep_cmdline androidboot.hardware` KEEPVERITY=true
for hw in taimen walleye; do ui_print "- Using system_root_image, keep dm/avb-verity"
if [ "$hw" = "$hardware" ]; then else
KEEPVERITY=true KEEPVERITY=false
ui_print "- Device on whitelist, keep avb-verity" fi
break
fi
done
fi fi
if [ -z $KEEPFORCEENCRYPT ]; then if [ -z $KEEPFORCEENCRYPT ]; then
if [ "`getprop ro.crypto.state`" = "encrypted" ]; then if [ "`getprop ro.crypto.state`" = "encrypted" ]; then