mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-01 21:13:09 +00:00
036 migration (#2750)
* chore: convert to use a value, cause why not * wip: Add the up for this going up * wip: trait changes * wip: Add in some more of the private transformations * chore(wip): Adding the ssh_keys todo * wip: Add cifs * fix migration structure * chore: Fix the trait for the version * wip(feat): Notifications are in the system * fix marker trait hell * handle key todos * wip: Testing the migration in a system. * fix pubkey parser * fix: migration works * wip: Trying to get the migration stuff? * fix: Can now install the packages that we wanted, yay!" * Merge branch 'next/minor' of github.com:Start9Labs/start-os into feat/migration --------- Co-authored-by: Aiden McClelland <me@drbonez.dev>
This commit is contained in:
@@ -408,6 +408,7 @@ impl Service {
|
||||
let developer_key = s9pk.as_archive().signer();
|
||||
let icon = s9pk.icon_data_url().await?;
|
||||
let service = Self::new(ctx.clone(), s9pk, StartStop::Stop).await?;
|
||||
|
||||
if let Some(recovery_source) = recovery_source {
|
||||
service
|
||||
.actor
|
||||
@@ -429,6 +430,7 @@ impl Service {
|
||||
.clone(),
|
||||
);
|
||||
}
|
||||
|
||||
let procedure_id = Guid::new();
|
||||
service
|
||||
.seed
|
||||
@@ -441,6 +443,7 @@ impl Service {
|
||||
) // TODO timeout
|
||||
.await
|
||||
.with_kind(ErrorKind::MigrationFailed)?; // TODO: handle cancellation
|
||||
|
||||
if let Some(mut progress) = progress {
|
||||
progress.finalization_progress.complete();
|
||||
progress.progress.complete();
|
||||
|
||||
@@ -307,7 +307,6 @@ impl ServiceMap {
|
||||
sync_progress_task.await.map_err(|_| {
|
||||
Error::new(eyre!("progress sync task panicked"), ErrorKind::Unknown)
|
||||
})??;
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.boxed())
|
||||
|
||||
Reference in New Issue
Block a user