Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix double mount

Browse Source
This commit is contained in:
Aiden McClelland
2022-02-10 21:30:05 -07:00
committed by Aiden McClelland
parent 6fbe207a8c
commit 55f5e78ae7
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/src/update/mod.rs
View File

@@ -394,52 +394,44 @@ async fn check_download(hash_from_header: &str, file_digest: Vec<u8>) -> Result<
async fn copy_machine_id(new_label: NewLabel) -> Result<(), Error> {
let new_guard = TmpMountGuard::mount(&new_label.0.as_fs()).await?;
let old_guard = TmpMountGuard::mount(&new_label.0.invert().as_fs()).await?;
tokio::fs::copy(
old_guard.as_ref().join("etc/machine-id"),
new_guard.as_ref().join("etc/machine-id"),
)
.await?;
tokio::fs::copy("/etc/machine-id", new_guard.as_ref().join("etc/machine-id")).await?;
new_guard.unmount().await?;
old_guard.unmount().await?;
Ok(())
}
async fn copy_ssh_host_keys(new_label: NewLabel) -> Result<(), Error> {
let new_guard = TmpMountGuard::mount(&new_label.0.as_fs()).await?;
let old_guard = TmpMountGuard::mount(&new_label.0.invert().as_fs()).await?;
tokio::fs::copy(
old_guard.as_ref().join("etc/ssh/ssh_host_rsa_key"),
"/etc/ssh/ssh_host_rsa_key",
new_guard.as_ref().join("etc/ssh/ssh_host_rsa_key"),
)
.await?;
tokio::fs::copy(
old_guard.as_ref().join("etc/ssh/ssh_host_rsa_key.pub"),
"/etc/ssh/ssh_host_rsa_key.pub",
new_guard.as_ref().join("etc/ssh/ssh_host_rsa_key.pub"),
)
.await?;
tokio::fs::copy(
old_guard.as_ref().join("etc/ssh/ssh_host_ecdsa_key"),
"/etc/ssh/ssh_host_ecdsa_key",
new_guard.as_ref().join("etc/ssh/ssh_host_ecdsa_key"),
)
.await?;
tokio::fs::copy(
old_guard.as_ref().join("etc/ssh/ssh_host_ecdsa_key.pub"),
"/etc/ssh/ssh_host_ecdsa_key.pub",
new_guard.as_ref().join("etc/ssh/ssh_host_ecdsa_key.pub"),
)
.await?;
tokio::fs::copy(
old_guard.as_ref().join("etc/ssh/ssh_host_ed25519_key"),
"/etc/ssh/ssh_host_ed25519_key",
new_guard.as_ref().join("etc/ssh/ssh_host_ed25519_key"),
)
.await?;
tokio::fs::copy(
old_guard.as_ref().join("etc/ssh/ssh_host_ed25519_key.pub"),
"/etc/ssh/ssh_host_ed25519_key.pub",
new_guard.as_ref().join("etc/ssh/ssh_host_ed25519_key.pub"),
)
.await?;
new_guard.unmount().await?;
old_guard.unmount().await?;
Ok(())
}