Skip to content
Open
Changes from all commits
Commits
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
20 changes: 4 additions & 16 deletions crates/trident/src/engine/manual_rollback/mod.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use std::{path::PathBuf, time::Instant};

use enumflags2::BitFlags;
use log::{debug, info, trace, warn};
use log::{debug, info, trace};

use osutils::{efivar, path, pcrlock};
use trident_api::{
config::Operations,
constants::{internal_params::NO_TRANSITION, ROOT_MOUNT_POINT_PATH},
constants::ROOT_MOUNT_POINT_PATH,
error::{InvalidInputError, ReportError, ServicingError, TridentError, TridentResultExt},
status::{ServicingState, ServicingType},
};
Expand Down Expand Up @@ -323,18 +323,6 @@ fn finalize_rollback(
host_status.servicing_state = ServicingState::ManualRollbackAbFinalized;
})?;

if !datastore
.host_status()
.spec
.internal_params
.get_flag(NO_TRANSITION)
{
Ok(ExitKind::NeedsReboot)
} else {
warn!(
"Skipping reboot as requested by internal parameter '{}'",
NO_TRANSITION
);
Ok(ExitKind::Done)
}
// A previous operation's noTransition override must not suppress this rollback's reboot.
Ok(ExitKind::NeedsReboot)
}
Loading