Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit d49eb572 authored by Rohit Sekhar's avatar Rohit Sekhar Committed by Nicolas Gelot
Browse files

FP4: Skip locking if stored SPL was empty 

* Do NOT LOCK bootloader incase the stored SPL was empty
* We have no idea what the actual rollback index might be, LOCKING might put
  the user in AVB red state and unbootable
* Just skip through the locking steps in this case
parent 0df48a3f

flash-scripts/linux/fp4_check_bootloader.sh

+9 −4
Original line number Diff line number Diff line
@@ -52,11 +52,16 @@ function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); } 
I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

I_MURENA__SECURITY_PATCH=$(versionToInt $MURENA__SECURITY_PATCH)



if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

if [[ "$I_ORIGINAL_SECURITY_PATCH" -lt "1" ]]

then

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

    echo "ORIGINAL ROM INFO NOT AVAILABLE => DO NOT PROCESS"

    sleep 30

elif [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

then

    echo "GREATER OR EQUALS => PROCESS"

else

    echo "LOWER DO NOT PROCESS"

    echo "LOWER => DO NOT PROCESS"

    sleep 30

fi



exit 0

flash-scripts/linux/fp4_lock.sh

+7 −3
Original line number Diff line number Diff line
@@ -53,11 +53,15 @@ function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); } 
I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

I_MURENA__SECURITY_PATCH=$(versionToInt $MURENA__SECURITY_PATCH)



if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

if [[ "$I_ORIGINAL_SECURITY_PATCH" -lt "1" ]]

then

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

    echo "ORIGINAL ROM INFO NOT AVAILABLE => DO NOT PROCESS"

    exit 0

elif [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

then

    echo "GREATER OR EQUALS => PROCESS"

else

    echo "LOWER DO NOT PROCESS"

    echo "LOWER => DO NOT PROCESS"

    exit 0

fi

flash-scripts/linux/fp4_lock_critical.sh

+6 −2
Original line number Diff line number Diff line
@@ -52,9 +52,13 @@ function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); } 
I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

I_MURENA__SECURITY_PATCH=$(versionToInt $MURENA__SECURITY_PATCH)



if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

if [[ "$I_ORIGINAL_SECURITY_PATCH" -lt "1" ]]

then

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

    echo "ORIGINAL ROM INFO NOT AVAILABLE => DO NOT PROCESS"

    exit 0

elif [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

then

    echo "GREATER OR EQUALS => PROCESS"

else

    echo "LOWER DO NOT PROCESS"

    "$FASTBOOT_PATH" reboot

flash-scripts/linux/wait-fastboot-locked.sh

+7 −3
Original line number Diff line number Diff line
@@ -51,11 +51,15 @@ function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); } 
I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

I_MURENA__SECURITY_PATCH=$(versionToInt $MURENA__SECURITY_PATCH)



if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

if [[ "$I_ORIGINAL_SECURITY_PATCH" -lt "1" ]]

then

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

    echo "ORIGINAL ROM INFO NOT AVAILABLE => DO NOT PROCESS"

    exit 0

elif [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

then

    echo "GREATER OR EQUALS => PROCESS"

else

    echo "LOWER DO NOT PROCESS"

    echo "LOWER => DO NOT PROCESS"

    exit 0

fi