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

Commit bb78faf1 authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch '1769devices-a14-fix-flash-script-hanging-issue' into 'a14' 

flash: Fix critical unlock check hanging the flash script

See merge request !254
parents 0c038807 e581d911

flash/factory.common

+4 −3
Original line number Diff line number Diff line
@@ -30,9 +30,10 @@ check_unlock_status() { 
      echo "Please follow the instructions to unlock the bootloader!"

      PHONE_IS_READY=false

    fi

    if ("${FASTBOOT_BIN}" oem device-info 2>&1 | grep -q "critical unlocked: false"); then

      echo "Error: Critical partitions are still locked."

      echo "Did you execute 'fastboot flashing unlock_critical'?"

    DEVICE_INFO_OUTPUT=$("${FASTBOOT_BIN}" oem device-info 2>&1)

    if [[ $DEVICE_INFO_OUTPUT != *"Device critical unlocked: true"* ]]; then

      echo "Error: Critical partitions are not unlocked."

      echo "Please execute 'fastboot flashing unlock_critical' first!"

      PHONE_IS_READY=false

    fi

  fi