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 96244D27F for ; Thu, 13 Jul 2023 11:50:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 62C9C37A02 for ; Thu, 13 Jul 2023 11:49:49 +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 ; Thu, 13 Jul 2023 11:49:48 +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 D0F0A4084B for ; Thu, 13 Jul 2023 11:49:47 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Thu, 13 Jul 2023 11:49:28 +0200 Message-ID: <20230713094941.475486-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230713094941.475486-1-c.heiss@proxmox.com> References: <20230713094941.475486-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.061 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH installer 4/7] tui: deserialize boot type and disk blocksize from runtime env info 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: Thu, 13 Jul 2023 09:50:19 -0000 This is needed later on to check whether a RAID setup is compatible with BIOS and 4Kn disks, in particular ZFS. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/options.rs | 1 + proxmox-tui-installer/src/setup.rs | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/proxmox-tui-installer/src/options.rs b/proxmox-tui-installer/src/options.rs index c8e8215..dab1730 100644 --- a/proxmox-tui-installer/src/options.rs +++ b/proxmox-tui-installer/src/options.rs @@ -222,6 +222,7 @@ pub struct Disk { pub path: String, pub model: Option, pub size: f64, + pub block_size: usize, } impl fmt::Display for Disk { diff --git a/proxmox-tui-installer/src/setup.rs b/proxmox-tui-installer/src/setup.rs index e8ee7f3..c56e608 100644 --- a/proxmox-tui-installer/src/setup.rs +++ b/proxmox-tui-installer/src/setup.rs @@ -262,13 +262,14 @@ fn deserialize_disks_map<'de, D>(deserializer: D) -> Result, D::Error> where D: Deserializer<'de>, { - let disks = >::deserialize(deserializer)?; + let disks = >::deserialize(deserializer)?; Ok(disks .into_iter() .map( |(index, device, size_mb, model, logical_bsize, _syspath)| Disk { index: index.to_string(), - size: (size_mb * logical_bsize) / 1024. / 1024. / 1024., + size: (size_mb * logical_bsize as f64) / 1024. / 1024. / 1024., + block_size: logical_bsize, path: device, model: (!model.is_empty()).then_some(model), }, @@ -351,6 +352,9 @@ where #[derive(Clone, Deserialize)] pub struct RuntimeInfo { + /// Whether is system was booted in (legacy) BIOS or UEFI mode. + pub boot_type: BootType, + /// Detected country if available. pub country: Option, @@ -365,6 +369,13 @@ pub struct RuntimeInfo { pub total_memory: usize, } +#[derive(Clone, Eq, Deserialize, PartialEq)] +#[serde(rename_all = "lowercase")] +pub enum BootType { + Bios, + Efi, +} + #[derive(Clone, Deserialize)] pub struct NetworkInfo { pub dns: Dns, -- 2.41.0