From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 763901FF29F for ; Thu, 18 Jul 2024 15:48:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 869A0D1B2; Thu, 18 Jul 2024 15:49:16 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Thu, 18 Jul 2024 15:48:51 +0200 Message-ID: <20240718134905.1177775-7-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240718134905.1177775-1-c.heiss@proxmox.com> References: <20240718134905.1177775-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.023 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 installer v2 06/17] common: setup: deserialize `secure_boot` property from runtime env 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Needed for the post-hook functionality, which sends this information as part of its information set. Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * new patch --- Proxmox/Install/RunEnv.pm | 1 + proxmox-installer-common/src/setup.rs | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm index 7eaf96a..bb60080 100644 --- a/Proxmox/Install/RunEnv.pm +++ b/Proxmox/Install/RunEnv.pm @@ -236,6 +236,7 @@ my sub detect_country_tracing_to : prototype($$) { # kernel_cmdline = , # total_memory = , # hvm_supported = <1 if the CPU supports hardware-accelerated virtualization>, +# secure_boot = <1 if SecureBoot is enabled>, # boot_type = , # disks => , # network => { diff --git a/proxmox-installer-common/src/setup.rs b/proxmox-installer-common/src/setup.rs index ee3d0c9..2ca9641 100644 --- a/proxmox-installer-common/src/setup.rs +++ b/proxmox-installer-common/src/setup.rs @@ -236,6 +236,14 @@ where Ok(val != 0) } +fn deserialize_bool_from_int_maybe<'de, D>(deserializer: D) -> Result, D::Error> +where + D: Deserializer<'de>, +{ + let val: Option = Deserialize::deserialize(deserializer)?; + Ok(val.map(|v| v != 0)) +} + fn deserialize_cczones_map<'de, D>( deserializer: D, ) -> Result>, D::Error> @@ -333,6 +341,10 @@ pub struct RuntimeInfo { /// Whether the CPU supports hardware-accelerated virtualization #[serde(deserialize_with = "deserialize_bool_from_int")] pub hvm_supported: bool, + + /// Whether the system was booted with SecureBoot enabled + #[serde(default, deserialize_with = "deserialize_bool_from_int_maybe")] + pub secure_boot: Option, } #[derive(Copy, Clone, Eq, Deserialize, PartialEq)] -- 2.45.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel