Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Defer unlock prompt until update is accepted #82

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Conversation

crawfxrd
Copy link
Member

@crawfxrd crawfxrd commented May 31, 2023

Move unlocking from EC validation to the main app update logic. This allows users to accept updating before unlocking, or cancel without unlocking.

This does not resolve the issue of returning to firmware-update when canceling/failing the unlock prompt, as the boot override still exists.

The UX for this needs additional improvements.

TEST:

  • Can successfully flash on a firmware-open board with firmware locking
  • Can successfully flash on a firmware-open board without firmware locking
  • Can successfully flash on a proprietary firmware board

Resolves: #81
Partially resolves: system76/firmware-open#405

Move unlocking from EC validation to the main app update logic. This
allows users to accept updating before unlocking, or cancel without
unlocking.

This does not resolve the issue of returning to firmware-update when
canceling/failing the unlock prompt, as the boot override still exists.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
@crawfxrd crawfxrd requested review from jackpot51 and a team May 31, 2023 16:58
@XV-02
Copy link

XV-02 commented Jun 28, 2023

I looked at:

  • Oryp11 (locking firmware)
  • Lemp11 (Non-locking firmware)
  • Pang10 (Proprietary)

And all three worked as I believe is expected:

  • Oryp11: Flash utility comes up, verifies the content, and presents the 'press enter to flash` prompt. Pressing enter prompts reboot and presents the lock. It unlocks, flashes, and does it's job.
  • Lemp11: Flash utility comes up, verifies the content, and presents the 'press enter to flash` prompt. Pressing enter Causes it to flash and reboot.
  • Pang10: Flash utility comes up, verifies the content, and presents the 'press enter to flash` prompt. Pressing enter Causes it to flash and reboot.

I also made sure to test a drive with the wrong firmware, which correctly errors out.

That sounds good?

@crawfxrd crawfxrd merged commit 2bfb2f9 into master Jun 28, 2023
3 checks passed
@crawfxrd crawfxrd deleted the defer-unlock branch June 28, 2023 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants