Revert "PL2: Add script to load correct patch level"

This reverts commit 0a64fbb2c46e9d7e8f1d9f1e158b9327c0e73fed.

recovery/root/init.recovery.qcom.rc

@@ -24,11 +24,10 @@ on init
     export LD_CONFIG_FILE /etc/ld.config.txt
 
     start hwservicemanager
-    start patchlevel
 
 on boot
     setprop sys.usb.config adb
-    wait /sbin/patchlevel_set
+    start prepdecrypt
 
 on property:crypto.ready=1
     start sbin_qseecomd
@@ -82,6 +81,13 @@ service sbin_qseecomd /sbin/qseecomd
     group root
     seclabel u:r:recovery:s0
 
+service prepdecrypt /sbin/prepdecrypt.sh
+    oneshot
+    disabled
+    user root
+    group root
+    seclabel u:r:recovery:s0
+
 # Handled by TWRP
 service keystore /sbin/keystore /tmp/misc/keystore
     disabled
@@ -98,10 +104,3 @@ service keystore_auth /sbin/keystore_auth
     user system
     group root
     seclabel u:r:recovery:s0
-
-service patchlevel /sbin/patchlevel.sh
-    user root
-    group root
-    disabled
-    oneshot
-    seclabel u:r:recovery:s0

recovery/root/sbin/patchlevel.sh

@@ -1,130 +0,0 @@
-#!/sbin/sh
-
-SCRIPTNAME="PatchLevel"
-LOGFILE=/tmp/recovery.log
-TEMPSYS=/s
-BUILDPROP=system/build.prop
-DEFAULTPROP=prop.default
-syspath="/dev/block/by-name/system$(getprop ro.boot.slot_suffix)"
-venbin="vendor/bin"
-SETFINGERPRINT=true
-
-log_info() {
-    echo "I:$SCRIPTNAME:$1" >> "$LOGFILE"
-}
-
-log_error() {
-    echo "E:$SCRIPTNAME:$1" >> "$LOGFILE"
-}
-
-temp_mount() {
-    mkdir "$1"
-    if [ -d "$1" ]; then
-        log_info "Temporary $2 folder created at $1."
-    else
-        log_error "Unable to create temporary $2 folder."
-        finish_error
-    fi
-    mount -t ext4 -o ro "$3" "$1"
-    if [ -n "$(ls -A "$1" 2>/dev/null)" ]; then
-        log_info "$2 mounted at $1."
-    else
-        log_error "Unable to mount $2 to temporary folder."
-        finish_error
-    fi
-}
-
-relink() {
-    log_info "Looking for $1 to update linker path..."
-    if [ -f "$1" ]; then
-        fname=$(basename "$1")
-        target="/sbin/$fname"
-        log_info "File found! Relinking $1 to $target..."
-        sed 's|/system/bin/linker|///////sbin/linker|' "$1" > "$target"
-        chmod 755 "$target"
-    else
-        log_info "File not found. Proceeding without relinking..."
-    fi
-}
-
-finish() {
-    umount "$TEMPSYS"
-    rmdir "$TEMPSYS"
-    touch /sbin/patchlevel_set
-    log_info "Script complete. Device ready for decryption."
-    exit 0
-}
-
-finish_error() {
-    umount "$TEMPSYS"
-    rmdir "$TEMPSYS"
-    log_error "Script run incomplete. Device not ready for decryption."
-    exit 0
-}
-
-osver_orig=$(getprop ro.build.version.release_orig)
-patchlevel_orig=$(getprop ro.build.version.security_patch_orig)
-osver=$(getprop ro.build.version.release)
-patchlevel=$(getprop ro.build.version.security_patch)
-device=$(getprop ro.product.device)
-fingerprint=$(getprop ro.build.fingerprint)
-product=$(getprop ro.build.product)
-
-log_info "Running patchlevel pre-decrypt script for TWRP..."
-for file in $(find $venbin -type f); do
-  relink "$file"
-done
-
-temp_mount "$TEMPSYS" "system" "$syspath"
-if [ -f "$TEMPSYS/$BUILDPROP" ]; then
-    log_info "Current system is Oreo or above. Proceed with setting OS version and security patch level..."
-    log_info "Build.prop exists! Setting system properties from build.prop"
-    log_info "Current OS version: $osver"
-    osver=$(grep -i 'ro.build.version.release' "$TEMPSYS/$BUILDPROP"  | cut -f2 -d'=' -s)
-    if [ -n "$osver" ]; then
-        resetprop ro.build.version.release "$osver"
-        sed -i "s/ro.build.version.release=.*/ro.build.version.release=""$osver""/g" "/$DEFAULTPROP" ;
-        log_info "New OS Version: $osver"
-    fi
-    log_info "Current security patch level: $patchlevel"
-    patchlevel=$(grep -i 'ro.build.version.security_patch' "$TEMPSYS/$BUILDPROP"  | cut -f2 -d'=' -s)
-    if [ -n "$patchlevel" ]; then
-        resetprop ro.build.version.security_patch "$patchlevel"
-        sed -i "s/ro.build.version.security_patch=.*/ro.build.version.security_patch=""$patchlevel""/g" "/$DEFAULTPROP" ;
-        log_info "New security patch level: $patchlevel"
-    fi
-    # Only needed for some devices (for stock OTA capability), so set "SETFINGERPRINT" variable to "false" if your device isn't one of them
-    if [ "$SETFINGERPRINT" = "true" ]; then
-        log_info "Current fingerprint: $fingerprint"
-        fingerprint=$(grep -i 'ro.build.fingerprint' "$TEMPSYS/$BUILDPROP"  | cut -f2 -d'=' -s)
-        if [ -n "$fingerprint" ]; then
-            resetprop ro.build.fingerprint "$fingerprint"
-            sed -i "s/ro.build.fingerprint=.*/ro.build.fingerprint=""$fingerprint""/g" "/$DEFAULTPROP" ;
-            log_info "New fingerprint: $fingerprint"
-        fi
-    fi
-else
-    if [ -n "$osver_orig" ]; then
-        log_info "Original OS version: $osver_orig"
-        log_info "Current OS version: $osver"
-        log_info "Setting OS Version to $osver_orig"
-        osver=$osver_orig
-        resetprop ro.build.version.release "$osver"
-        sed -i "s/ro.build.version.release=.*/ro.build.version.release=""$osver""/g" "/$DEFAULTPROP" ;
-    else
-        log_info "No Original OS Version found. Proceeding with existing value."
-        log_info "Current OS version: $osver"
-    fi
-    if [ -n "$patchlevel_orig" ]; then
-        log_info "Original security patch level: $patchlevel_orig"
-        log_info "Current security patch level: $patchlevel"
-        log_info "Setting security patch level to $patchlevel_orig"
-        patchlevel=$patchlevel_orig
-        resetprop ro.build.version.security_patch "$patchlevel"
-        sed -i "s/ro.build.version.security_patch=.*/ro.build.version.security_patch=""$patchlevel""/g" "/$DEFAULTPROP" ;
-    else
-        log_info "No Original security patch level found. Proceeding with existing value."
-        log_info "Current security patch level: $patchlevel"
-    fi
-fi
-finish

recovery/root/sbin/prepdecrypt.sh

@@ -0,0 +1,36 @@
+#!/sbin/sh
+
+finish() {
+    umount /s
+
+    setprop crypto.ready 1
+
+    exit 0
+}
+
+suffix=$(getprop ro.boot.slot_suffix)
+if [ -z "$suffix" ]; then
+    suf=$(getprop ro.boot.slot)
+    suffix="_$suf"
+fi
+
+syspath="/dev/block/bootdevice/by-name/system$suffix"
+mkdir /s
+mount -t ext4 -o ro "$syspath" /s
+
+is_fastboot_twrp=$(getprop ro.boot.fastboot)
+if [ ! -z "$is_fastboot_twrp" ]; then
+    setprop ro.build.version.release "$(getprop ro.build.version.release_orig)"
+    setprop ro.build.version.security_patch "$(getprop ro.build.version.security_patch_orig)"
+    finish
+fi
+
+if [ -f /s/system/build.prop ]; then
+    setprop ro.build.version.release "$(grep -i 'ro.build.version.release' /s/system/build.prop | cut -f2 -d'=')"
+    setprop ro.build.version.security_patch "$(grep -i 'ro.build.version.security_patch' /s/system/build.prop  | cut -f2 -d'=')"
+    finish
+fi
+
+setprop ro.build.version.release "$(getprop ro.build.version.release_orig)"
+setprop ro.build.version.security_patch "$(getprop ro.build.version.security_patch_orig)"
+finish