From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <g.goller@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id EC01A9E127
for <pbs-devel@lists.proxmox.com>; Mon, 27 Nov 2023 09:27:12 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id C8E5121B6
for <pbs-devel@lists.proxmox.com>; Mon, 27 Nov 2023 09:26:42 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pbs-devel@lists.proxmox.com>; Mon, 27 Nov 2023 09:26:42 +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 CF60444A0C
for <pbs-devel@lists.proxmox.com>; Mon, 27 Nov 2023 09:26:41 +0100 (CET)
Message-ID: <7173334e-f855-40c1-ab9f-a9b3c5fecc57@proxmox.com>
Date: Mon, 27 Nov 2023 09:26:41 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Lukas Wagner <l.wagner@proxmox.com>,
Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>
References: <20231124120228.180173-1-g.goller@proxmox.com>
<20231124120228.180173-3-g.goller@proxmox.com>
<a716bc1d-777b-4a85-ac38-888238e770e3@proxmox.com>
Content-Language: en-US
From: Gabriel Goller <g.goller@proxmox.com>
In-Reply-To: <a716bc1d-777b-4a85-ac38-888238e770e3@proxmox.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.223 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
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2023 08:27:13 -0000
On 11/24/23 15:20, Lukas Wagner wrote:
>
>
> 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<boot_mode::BootModeInformation> impl would be a
> bit more idiomatic?
Thought about this as well, but sadly the orphan rule ruins the day :(
I also don't want to import `proxmox_sys` in `pbs-api-types` or viceversa.
>
>> +
>> #[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',
>