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

dont set guid until setup is complete

Browse Source
This commit is contained in:
Aiden McClelland
2021-09-11 20:57:07 -06:00
committed by Aiden McClelland
parent 90516855d6
commit 5b7cd2a565
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
appmgr/src/setup.rs
View File

@@ -23,7 +23,6 @@ pub struct StatusRes {
#[command(rpc_only)] #[command(rpc_only)]
pub fn status() -> Result<StatusRes, Error> { pub fn status() -> Result<StatusRes, Error> {
// TODO
Ok(StatusRes { Ok(StatusRes {
is_recovering: false, is_recovering: false,
tor_address: None, tor_address: None,
@@ -45,9 +44,6 @@ pub async fn execute(
let guid = let guid =
crate::disk::main::create(&ctx.zfs_pool_name, [embassy_logicalname], DEFAULT_PASSWORD) crate::disk::main::create(&ctx.zfs_pool_name, [embassy_logicalname], DEFAULT_PASSWORD)
.await?; .await?;
tokio::fs::write("/embassy-os/disk.guid", &guid)
.await
.with_ctx(|_| (crate::ErrorKind::Filesystem, "/embassy-os/disk.guid"))?;
crate::disk::main::load(&guid, &ctx.zfs_pool_name, &ctx.datadir, DEFAULT_PASSWORD).await?; crate::disk::main::load(&guid, &ctx.zfs_pool_name, &ctx.datadir, DEFAULT_PASSWORD).await?;
let password = argon2::hash_encoded( let password = argon2::hash_encoded(
embassy_password.as_bytes(), embassy_password.as_bytes(),
@@ -66,6 +62,9 @@ pub async fn execute(
) )
.execute(&mut sqlite_pool.acquire().await?) .execute(&mut sqlite_pool.acquire().await?)
.await?; .await?;
tokio::fs::write("/embassy-os/disk.guid", &guid)
.await
.with_ctx(|_| (crate::ErrorKind::Filesystem, "/embassy-os/disk.guid"))?;
Ok(SetupResult { Ok(SetupResult {
tor_address: tor_key.public().get_onion_address().to_string(), tor_address: tor_key.public().get_onion_address().to_string(),