Clean workspace after rootfs finalization failure

1 files changed, 5 insertions, 2 deletions

diff --git a/src/build.rs b/src/build.rs
index 994b793..1fd7720 100644
--- a/src/build.rs
+++ b/src/build.rs
@@ -70,7 +70,7 @@ impl<I: PackageInstaller, B: InitramfsBuilder> BuildExecutor<I, B> {
                 anyhow::anyhow!("package installer did not create rootfs: {}", rootfs.display()),
             );
         }
-        RootfsFinalization::new(
+        if let Err(error) = RootfsFinalization::new(
             Vec::new(),
             InitrdOem::new(
                 plan.spec().boot.initrd_features.iter().cloned(),
@@ -78,7 +78,10 @@ impl<I: PackageInstaller, B: InitramfsBuilder> BuildExecutor<I, B> {
             ),
             Vec::new(),
         )
-        .apply(&rootfs)?;
+        .apply(&rootfs)
+        {
+            return Self::fail_and_remove_workspace(workspace, error);
+        }
 
         let initramfs_request = match InitramfsRequest::discover(&rootfs) {
             Ok(request) => request,