Signed-off-by: Aaron Lauterer <a.laute...@proxmox.com> --- proxmox-tui-installer/src/main.rs | 40 +------------------------------ 1 file changed, 1 insertion(+), 39 deletions(-)
diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs index 875a33a..3216868 100644 --- a/proxmox-tui-installer/src/main.rs +++ b/proxmox-tui-installer/src/main.rs @@ -5,7 +5,6 @@ use std::{ env, io::{BufRead, BufReader, Write}, net::IpAddr, - path::PathBuf, str::FromStr, sync::{Arc, Mutex}, thread, @@ -32,7 +31,7 @@ use options::InstallerOptions; use proxmox_installer_common::{ options::{BootdiskOptions, NetworkOptions, PasswordOptions, TimezoneOptions}, - setup::{LocaleInfo, ProxmoxProduct, RuntimeInfo, SetupInfo}, + setup::{installer_setup, LocaleInfo, ProxmoxProduct, RuntimeInfo, SetupInfo}, utils::Fqdn, }; @@ -197,43 +196,6 @@ fn main() { siv.run(); } -fn installer_setup(in_test_mode: bool) -> Result<(SetupInfo, LocaleInfo, RuntimeInfo), String> { - let base_path = if in_test_mode { "./testdir" } else { "/" }; - let mut path = PathBuf::from(base_path); - - path.push("run"); - path.push("proxmox-installer"); - - let installer_info: SetupInfo = { - let mut path = path.clone(); - path.push("iso-info.json"); - - setup::read_json(&path).map_err(|err| format!("Failed to retrieve setup info: {err}"))? - }; - - let locale_info = { - let mut path = path.clone(); - path.push("locales.json"); - - setup::read_json(&path).map_err(|err| format!("Failed to retrieve locale info: {err}"))? - }; - - let mut runtime_info: RuntimeInfo = { - let mut path = path.clone(); - path.push("run-env-info.json"); - - setup::read_json(&path) - .map_err(|err| format!("Failed to retrieve runtime environment info: {err}"))? - }; - - runtime_info.disks.sort(); - if runtime_info.disks.is_empty() { - Err("The installer could not find any supported hard disks.".to_owned()) - } else { - Ok((installer_info, locale_info, runtime_info)) - } -} - /// Anything that can be done late in the setup and will not result in fatal errors. fn installer_setup_late(siv: &mut Cursive) { let state = siv.user_data::<InstallerState>().cloned().unwrap(); -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel