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 838819DACB for ; Fri, 24 Nov 2023 15:21:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6BDDB10C6A for ; Fri, 24 Nov 2023 15:20:53 +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 ; Fri, 24 Nov 2023 15:20:52 +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 DF86243C06 for ; Fri, 24 Nov 2023 15:20:51 +0100 (CET) Message-ID: Date: Fri, 24 Nov 2023 15:20:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Lukas Wagner To: Proxmox Backup Server development discussion , Gabriel Goller References: <20231124120228.180173-1-g.goller@proxmox.com> <20231124120228.180173-3-g.goller@proxmox.com> Content-Language: de-AT, en-US In-Reply-To: <20231124120228.180173-3-g.goller@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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 v2 proxmox-backup 2/3] node: status: added bootmode 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: Fri, 24 Nov 2023 14:21:23 -0000 On 11/24/23 13:02, Gabriel Goller wrote: > > +fn boot_mode_to_info(bm: boot_mode::BootModeInformation) -> BootModeInformation { > + match bm { > + boot_mode::BootModeInformation::Efi => BootModeInformation::Efi, > + boot_mode::BootModeInformation::EfiSecureBoot => BootModeInformation::EfiSecureBoot, > + boot_mode::BootModeInformation::Bios => BootModeInformation::Bios, > + } > +} Mini nit: Maybe a From impl would be a bit more idiomatic? > + > #[api( > input: { > properties: { > @@ -79,6 +89,8 @@ async fn get_status( > > let disk = crate::tools::fs::fs_info_static(proxmox_lang::c_str!("/")).await?; > > + let boot_info = boot_mode_to_info(boot_mode::boot_mode()); > + > Ok(NodeStatus { > memory, > swap, > @@ -96,6 +108,7 @@ async fn get_status( > info: NodeInformation { > fingerprint: crate::cert_info()?.fingerprint()?, > }, > + boot_info, > }) > } > > diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js > index 2551c9a5..14f84a2e 100644 > --- a/www/panel/NodeInfo.js > +++ b/www/panel/NodeInfo.js > @@ -147,6 +147,23 @@ Ext.define('PBS.NodeInfoPanel', { > textField: 'kversion', > value: '', > }, > + { > + colspan: 2, > + title: gettext('Boot Mode'), > + printBar: false, > + textField: 'boot-info', > + renderer: boot_mode => { > + if (boot_mode === 'bios') { > + return 'Legacy BIOS'; > + } else if (boot_mode === 'efi') { > + return 'EFI'; > + } else if (boot_mode === 'efisecureboot') { > + return 'EFI (Secure Boot)'; > + } > + return Proxmox.Utils.unknownText; > + }, > + value: '', > + }, > { > xtype: 'pmxNodeInfoRepoStatus', > itemId: 'repositoryStatus', -- - Lukas