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.

Sign up for GitHub

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

Jump to bottom

signpost: cancel-upgrade behavior fix #950

Merged
merged 1 commit into from
Jun 20, 2020
Merged

signpost: cancel-upgrade behavior fix #950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions sources/updater/signpost/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@ impl State {
}

/// Sets the inactive partition as a new upgrade partition, but **does not write to the disk**.
/// Ensures that the inactive partition is marked as valid beforehand
///
/// * Sets the inactive partition's priority to 2 and the active partition's priority to 1.
/// * Sets the inactive partition's tries left to 1.
/// * Sets the inactive partition as not successfully booted.
/// * Returns an error if the partition has not been marked as potentially
/// valid or if it has already been marked for upgrade.
Expand Down Expand Up @@ -243,10 +243,12 @@ impl State {

/// Reverts upgrade_to_inactive(), but **does not write to the disk**.
///
/// * Clears all bits of the inactive partition.
/// * Sets the inactive partition's priority to 0
/// * Restores the active partition's priority to 2
pub fn cancel_upgrade(&mut self) {
self.clear_inactive();
let mut inactive_flags = self.gptprio(self.inactive());
inactive_flags.set_priority(0);
self.set_gptprio(self.inactive(), inactive_flags);

let mut active_flags = self.gptprio(self.active());
active_flags.set_priority(2);
Expand Down