Add new verified boot error props deletion

This commit is contained in:
Chris Renshaw
2025-01-18 00:00:41 -04:00
committed by GitHub
parent df5d5b7ce9
commit 9b3801a117
3 changed files with 14 additions and 2 deletions

View File

@@ -37,6 +37,13 @@ resetprop_hexpatch() {
| dd obs=1 count=93 seek=$((NAMEOFFSET-93)) conv=notrunc of="$PROPFILE" | dd obs=1 count=93 seek=$((NAMEOFFSET-93)) conv=notrunc of="$PROPFILE"
} }
# delprop_if_exist <prop name>
delprop_if_exist() {
local NAME="$1"
[ -n "$(resetprop "$NAME")" ] && resetprop --delete "$NAME"
}
# resetprop_if_diff <prop name> <expected value> # resetprop_if_diff <prop name> <expected value>
resetprop_if_diff() { resetprop_if_diff() {
local NAME="$1" local NAME="$1"

View File

@@ -37,6 +37,11 @@ for PROP in $(resetprop | grep -oE 'ro.*.build.type'); do
resetprop_if_diff $PROP user resetprop_if_diff $PROP user
done done
resetprop_if_diff ro.adb.secure 1 resetprop_if_diff ro.adb.secure 1
if ! $SKIPDELPROP; then
delprop_if_exist ro.boot.verifiedbooterror
delprop_if_exist ro.boot.verifyerrorpart
fi
resetprop_if_diff ro.boot.veritymode.managed yes
resetprop_if_diff ro.debuggable 0 resetprop_if_diff ro.debuggable 0
resetprop_if_diff ro.force.debuggable 0 resetprop_if_diff ro.force.debuggable 0
resetprop_if_diff ro.secure 1 resetprop_if_diff ro.secure 1

View File

@@ -11,8 +11,8 @@ resetprop_if_match vendor.boot.mode recovery unknown
# SELinux # SELinux
resetprop_if_diff ro.boot.selinux enforcing resetprop_if_diff ro.boot.selinux enforcing
# use delete since it can be 0 or 1 for enforcing depending on OEM # use delete since it can be 0 or 1 for enforcing depending on OEM
if ! $SKIPDELPROP && [ -n "$(resetprop ro.build.selinux)" ]; then if ! $SKIPDELPROP; then
resetprop --delete ro.build.selinux delprop_if_exist ro.build.selinux
fi fi
# use toybox to protect stat access time reading # use toybox to protect stat access time reading
if [ "$(toybox cat /sys/fs/selinux/enforce)" = "0" ]; then if [ "$(toybox cat /sys/fs/selinux/enforce)" = "0" ]; then