From 4e7f7d84133031578cd723c272b154aba21d797d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 26 Aug 2022 17:56:22 -0600 Subject: [PATCH] Update to use new boot directory format --- src/bin/installer_tui.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bin/installer_tui.rs b/src/bin/installer_tui.rs index 8e3d0b8a52..e3ad8e63e3 100644 --- a/src/bin/installer_tui.rs +++ b/src/bin/installer_tui.rs @@ -261,7 +261,7 @@ fn main() { let password_opt = choose_password(); let bootloader = { - let path = root_path.join("bootloader"); + let path = root_path.join("boot").join("bootloader.bios"); let mut bootloader = match fs::read(&path) { Ok(ok) => ok, Err(err) => { @@ -298,12 +298,9 @@ fn main() { } }; - // Copy bootloader, filesystem.toml, initfs, and kernel + // Copy filesystem.toml, which is not packaged let mut files = vec![ - "bootloader".to_string(), "filesystem.toml".to_string(), - "initfs".to_string(), - "kernel".to_string() ]; // Copy files from locally installed packages