From 60e1cc4e8f050f53f3860c792d855f5b2a4193d1 Mon Sep 17 00:00:00 2001 From: snake-4 <18491360+snake-4@users.noreply.github.com> Date: Sat, 22 Feb 2025 18:48:24 +0100 Subject: [PATCH] Sync boot scripts to PlayIntegrityFork 1493650 --- module/template/common_func.sh | 10 ++++++++++ module/template/post-fs-data.sh | 5 +++++ module/template/service.sh | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/module/template/common_func.sh b/module/template/common_func.sh index 7623096..77ca58e 100644 --- a/module/template/common_func.sh +++ b/module/template/common_func.sh @@ -1,3 +1,6 @@ +SKIPDELPROP=false +[ -f "$MODPATH/skipdelprop" ] && SKIPDELPROP=true + # resetprop_if_diff resetprop_if_diff() { local NAME="$1" @@ -15,3 +18,10 @@ resetprop_if_match() { [[ "$(resetprop "$NAME")" = *"$CONTAINS"* ]] && resetprop -n "$NAME" "$VALUE" } + +# delprop_if_exist +delprop_if_exist() { + local NAME="$1" + + [ -n "$(resetprop "$NAME")" ] && resetprop --delete "$NAME" +} diff --git a/module/template/post-fs-data.sh b/module/template/post-fs-data.sh index 2509251..2f9ee73 100644 --- a/module/template/post-fs-data.sh +++ b/module/template/post-fs-data.sh @@ -25,6 +25,11 @@ for PROP in $(resetprop | grep -oE 'ro.*.build.type'); do resetprop_if_diff $PROP user done 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.force.debuggable 0 resetprop_if_diff ro.secure 1 \ No newline at end of file diff --git a/module/template/service.sh b/module/template/service.sh index 96e8060..b1761a1 100644 --- a/module/template/service.sh +++ b/module/template/service.sh @@ -11,8 +11,8 @@ resetprop_if_match vendor.boot.mode recovery unknown # SELinux resetprop_if_diff ro.boot.selinux enforcing # use delete since it can be 0 or 1 for enforcing depending on OEM -if [ -n "$(resetprop ro.build.selinux)" ]; then - resetprop --delete ro.build.selinux +if ! $SKIPDELPROP; then + delprop_if_exist ro.build.selinux fi # use toybox to protect stat access time reading if [ "$(toybox cat /sys/fs/selinux/enforce)" = "0" ]; then