refactor public/private gateways

core/startos/src/setup.rs

@@ -36,6 +36,7 @@ use crate::net::ssl::root_ca_start_time;
 use crate::prelude::*;
 use crate::progress::{FullProgress, PhaseProgressTrackerHandle, ProgressUnits};
 use crate::rpc_continuations::Guid;
+use crate::shutdown::Shutdown;
 use crate::system::sync_kiosk;
 use crate::util::crypto::EncryptedWire;
 use crate::util::io::{create_file, dir_copy, dir_size, Counter};
@@ -67,6 +68,7 @@ pub fn setup<C: Context>() -> ParentHandler<C> {
             "logs",
             from_fn_async(crate::logs::cli_logs::<SetupContext, Empty>).no_display(),
         )
+        .subcommand("restart", from_fn_async(restart).no_cli())
 }
 
 pub fn disk<C: Context>() -> ParentHandler<C> {
@@ -172,6 +174,7 @@ pub async fn attach(
                 if disk_guid.ends_with("_UNENC") { None } else { Some(DEFAULT_PASSWORD) },
             )
             .await?;
+            let _ = setup_ctx.disk_guid.set(disk_guid.clone());
             if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
                 tokio::fs::remove_file(REPAIR_DISK_PATH)
                     .await
@@ -390,9 +393,19 @@ pub async fn complete(ctx: SetupContext) -> Result<SetupResult, Error> {
 }
 
 #[instrument(skip_all)]
-// #[command(rpc_only)]
 pub async fn exit(ctx: SetupContext) -> Result<(), Error> {
-    ctx.shutdown.send(()).expect("failed to shutdown");
+    ctx.shutdown.send(None).expect("failed to shutdown");
+    Ok(())
+}
+
+#[instrument(skip_all)]
+pub async fn restart(ctx: SetupContext) -> Result<(), Error> {
+    ctx.shutdown
+        .send(Some(Shutdown {
+            disk_guid: ctx.disk_guid.get().cloned(),
+            restart: true,
+        }))
+        .expect("failed to shutdown");
     Ok(())
 }
 
@@ -435,6 +448,7 @@ pub async fn execute_inner(
     );
     let _ = crate::disk::main::import(&*guid, DATA_DIR, RepairStrategy::Preen, encryption_password)
         .await?;
+    let _ = ctx.disk_guid.set(guid.clone());
     disk_phase.complete();
 
     let progress = SetupExecuteProgress {