From 89dcc2c060e376849a27cecbb8b72b4af3e308db Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 15 Sep 2019 13:31:59 -0600 Subject: [PATCH] Add unmounting message --- src/bin/installer_tui.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/installer_tui.rs b/src/bin/installer_tui.rs index b60de2c78a..4904588bf9 100644 --- a/src/bin/installer_tui.rs +++ b/src/bin/installer_tui.rs @@ -137,6 +137,8 @@ fn with_redoxfs(disk_path: &P, bootloader: &[u8], callback: F) fn package_files(config: &mut Config, files: &mut Vec) -> io::Result<()> { //TODO: Remove packages from config where all files are located (and have valid shasum?) + config.packages.clear(); + for entry_res in fs::read_dir("file:/pkg")? { let entry = entry_res?; let path = entry.path(); @@ -286,11 +288,11 @@ fn main() { eprintln!("finished copying {} files", files.len()); - // Packages will be copied locally, not installed from package server - config.packages.clear(); - let cookbook: Option<&'static str> = None; - redox_installer::install(config, mount_path, cookbook) + redox_installer::install(config, mount_path, cookbook)?; + + eprintln!("finished installing, unmounting filesystem"); + Ok(()) }); if let Err(err) = res {