From 73bd97310948c82f924a4e8c2dea7adf1874549c Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Thu, 13 Jul 2023 14:36:35 -0600 Subject: [PATCH] delete disk guid on reflash (#2334) * delete disk guid on reflash * delete unnecessary files before copy --- backend/src/os_install/mod.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/backend/src/os_install/mod.rs b/backend/src/os_install/mod.rs index 3edfa2d97..36314c11d 100644 --- a/backend/src/os_install/mod.rs +++ b/backend/src/os_install/mod.rs @@ -153,18 +153,24 @@ pub async fn execute( { if let Err(e) = async { // cp -r ${guard}/config /tmp/config - Command::new("cp") - .arg("-r") - .arg(guard.as_ref().join("config")) - .arg("/tmp/config.bak") - .invoke(crate::ErrorKind::Filesystem) - .await?; if tokio::fs::metadata(guard.as_ref().join("config/upgrade")) .await .is_ok() { tokio::fs::remove_file(guard.as_ref().join("config/upgrade")).await?; } + if tokio::fs::metadata(guard.as_ref().join("config/disk.guid")) + .await + .is_ok() + { + tokio::fs::remove_file(guard.as_ref().join("config/disk.guid")).await?; + } + Command::new("cp") + .arg("-r") + .arg(guard.as_ref().join("config")) + .arg("/tmp/config.bak") + .invoke(crate::ErrorKind::Filesystem) + .await?; guard.unmount().await } .await