Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 14:29:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

include 0.2.x in recovery_info

Browse Source
This commit is contained in:
Aiden McClelland
2021-12-23 14:18:08 -07:00
committed by Aiden McClelland
parent dd9706c665
commit ec17059784
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
appmgr/src/disk/util.rs
View File

@@ -205,7 +205,7 @@ pub async fn recovery_info(
.await .await
.is_ok() .is_ok()
{ {
Ok(Some( return Ok(Some(
IoFormat::Cbor.from_slice( IoFormat::Cbor.from_slice(
&tokio::fs::read(&backup_unencrypted_metadata_path) &tokio::fs::read(&backup_unencrypted_metadata_path)
.await .await
@@ -216,10 +216,19 @@ pub async fn recovery_info(
) )
})?, })?,
)?, )?,
)) ));
} else {
Ok(None)
} }
let version_path = mountpoint.as_ref().join("root/appmgr/version");
if tokio::fs::metadata(&version_path).await.is_ok() {
return Ok(Some(EmbassyOsRecoveryInfo {
version: from_yaml_async_reader(File::open(&version_path).await?).await?,
full: true,
password_hash: None,
wrapped_key: None,
}));
}
Ok(None)
} }
#[instrument] #[instrument]
@@ -333,19 +342,6 @@ pub async fn list() -> Result<Vec<DiskInfo>, Error> {
} }
} { } {
embassy_os = Some(recovery_info) embassy_os = Some(recovery_info)
} else if label.as_deref() == Some("rootfs") {
let version_path = mount_guard.as_ref().join("root/appmgr/version");
if tokio::fs::metadata(&version_path).await.is_ok() {
embassy_os = Some(EmbassyOsRecoveryInfo {
version: from_yaml_async_reader(
File::open(&version_path).await?,
)
.await?,
full: true,
password_hash: None,
wrapped_key: None,
});
}
} }
mount_guard.unmount().await?; mount_guard.unmount().await?;
} }