From 2a58713a970291651f7e49392a1033a4af261efd Mon Sep 17 00:00:00 2001 From: karencfv Date: Fri, 13 Jun 2025 13:17:02 +1200 Subject: [PATCH 1/2] [reconfigurator] rot-bootloader subcommand for reconfigurator-sp-updater --- dev-tools/reconfigurator-sp-updater/src/main.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dev-tools/reconfigurator-sp-updater/src/main.rs b/dev-tools/reconfigurator-sp-updater/src/main.rs index 7e805eed858..0158575f075 100644 --- a/dev-tools/reconfigurator-sp-updater/src/main.rs +++ b/dev-tools/reconfigurator-sp-updater/src/main.rs @@ -421,6 +421,14 @@ enum Component { #[arg(long, short = 't')] expected_transient_boot_preference: Option, }, + RotBootloader { + /// expected version of the active slot + #[arg(long, short = 'a')] + expected_stage0_version: ArtifactVersion, + /// expected version of the inactive slot + #[arg(long, short = 'i')] + expected_stage0_next_version: ExpectedVersion, + }, } fn cmd_set( @@ -481,6 +489,13 @@ fn cmd_set( expected_transient_boot_preference, } } + Component::RotBootloader { + expected_stage0_version, + expected_stage0_next_version, + } => PendingMgsUpdateDetails::RotBootloader { + expected_stage0_version, + expected_stage0_next_version, + }, }, artifact_hash: args.artifact_hash, artifact_version: ArtifactVersion::new(args.version) From c0f92a739a99337a109ae1c8d4f44d68cdc83d83 Mon Sep 17 00:00:00 2001 From: karencfv Date: Tue, 17 Jun 2025 08:37:01 +1200 Subject: [PATCH 2/2] address comments --- dev-tools/reconfigurator-sp-updater/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/reconfigurator-sp-updater/src/main.rs b/dev-tools/reconfigurator-sp-updater/src/main.rs index 0158575f075..2f81170ea30 100644 --- a/dev-tools/reconfigurator-sp-updater/src/main.rs +++ b/dev-tools/reconfigurator-sp-updater/src/main.rs @@ -422,10 +422,10 @@ enum Component { expected_transient_boot_preference: Option, }, RotBootloader { - /// expected version of the active slot + /// expected version of stage0 (active slot) #[arg(long, short = 'a')] expected_stage0_version: ArtifactVersion, - /// expected version of the inactive slot + /// expected version of stage0 next (inactive slot) #[arg(long, short = 'i')] expected_stage0_next_version: ExpectedVersion, },