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 F01679E582 for ; Mon, 27 Nov 2023 14:24:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CF6417DFD for ; Mon, 27 Nov 2023 14:23:57 +0100 (CET) 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 ; Mon, 27 Nov 2023 14:23:57 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1A38944B4F for ; Mon, 27 Nov 2023 14:23:57 +0100 (CET) Message-ID: Date: Mon, 27 Nov 2023 14:23:56 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Wolfgang Bumiller Cc: pbs-devel@lists.proxmox.com References: <20231127105238.99947-1-g.goller@proxmox.com> <20231127105238.99947-2-g.goller@proxmox.com> From: Gabriel Goller In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.200 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: Re: [pbs-devel] [PATCH v4 proxmox 1/3] sys: add function to get boot_mode X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2023 13:24:28 -0000 Thanks for the review! On 11/27/23 14:08, Wolfgang Bumiller wrote: > On Mon, Nov 27, 2023 at 11:52:36AM +0100, Gabriel Goller wrote: >> Helper that returns the current boot_mode. Either EFI, BIOS, or EFI >> (Secure Boot). >> Detection works the same as in pve, we use `/sys/firmware/efi` and >> the `efivars/SecureBoot-xxx..` file. >> >> Signed-off-by: Gabriel Goller >> --- >> proxmox-sys/src/boot_mode.rs | 54 ++++++++++++++++++++++++++++++++++++ >> proxmox-sys/src/lib.rs | 1 + >> 2 files changed, 55 insertions(+) >> create mode 100644 proxmox-sys/src/boot_mode.rs >> >> diff --git a/proxmox-sys/src/boot_mode.rs b/proxmox-sys/src/boot_mode.rs >> new file mode 100644 >> index 0000000..6dcdf07 >> --- /dev/null >> +++ b/proxmox-sys/src/boot_mode.rs >> @@ -0,0 +1,54 @@ >> +use std::{io::Read, sync::Mutex}; >> + >> +#[derive(Clone, Copy)] >> +pub enum SecureBoot { >> + /// SecureBoot is enabled >> + Enabled, >> + /// SecureBoot is disabled >> + Disabled, >> +} >> + >> +/// The possible BootModes >> +#[derive(Clone, Copy)] >> +pub enum BootModeInformation { >> + /// The BootMode is EFI/UEFI, has a SecureBoot variant >> + Efi(SecureBoot), >> + /// The BootMode is Legacy BIOS >> + Bios, >> +} >> + >> +// Returns the current bootmode (BIOS, EFI, or EFI(Secure Boot)) >> +pub fn boot_mode() -> BootModeInformation { > In addition to my v3 reply with the range comparison: please avoid more > free-standing functions for this type of stuff. > > Instead, this could be BootModeInformation::query(). > > Also, are we sure we want this a a nested enum if we separate it in > `pbs-api-types` later? Maybe these should just stay separate things, > queried via BootMode::query() + SecureBoot::query() > (A bit shorter with the `Information` suffix dropped there...) Oh, that's actually not a bad idea. I would have one `BootMode::query()` function that just checks if the `/sys/firmare/efi` dir exists and return `Bios` or `Efi` + another function `SecureBoot::query()` that returns `Enabled` or `Disabled` if the secureboot is enabled (checking the SecureBoot-xxx efivar).