From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A70489D41B for ; Wed, 25 Oct 2023 18:00:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 885BF16945 for ; Wed, 25 Oct 2023 18:00:15 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 25 Oct 2023 18:00:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1EF7E4644B for ; Wed, 25 Oct 2023 18:00:14 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Wed, 25 Oct 2023 18:00:10 +0200 Message-Id: <20231025160011.3617524-12-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231025160011.3617524-1-a.lauterer@proxmox.com> References: <20231025160011.3617524-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.076 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH 11/12] tui: use installer_setup from common cate X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2023 16:00:45 -0000 Signed-off-by: Aaron Lauterer --- 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::().cloned().unwrap(); -- 2.39.2