From 5f92f9e96505b34c7b88558964707c28faeed7ca Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Wed, 19 Jul 2023 08:50:02 -0600 Subject: [PATCH] fix ROFS error on os install (#2364) --- backend/src/os_install/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/os_install/mod.rs b/backend/src/os_install/mod.rs index 36314c11d..19f320f06 100644 --- a/backend/src/os_install/mod.rs +++ b/backend/src/os_install/mod.rs @@ -149,7 +149,7 @@ pub async fn execute( if !overwrite { if let Ok(guard) = - TmpMountGuard::mount(&BlockDev::new(part_info.root.clone()), MountType::ReadOnly).await + TmpMountGuard::mount(&BlockDev::new(part_info.root.clone()), MountType::ReadWrite).await { if let Err(e) = async { // cp -r ${guard}/config /tmp/config @@ -171,13 +171,14 @@ pub async fn execute( .arg("/tmp/config.bak") .invoke(crate::ErrorKind::Filesystem) .await?; - guard.unmount().await + Ok::<_, Error>(()) } .await { tracing::error!("Error recovering previous config: {e}"); tracing::debug!("{e:?}"); } + guard.unmount().await?; } }