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 AA9A9BE8B for ; Fri, 11 Aug 2023 09:35:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8BB349FF4 for ; Fri, 11 Aug 2023 09:34:41 +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 ; Fri, 11 Aug 2023 09:34:40 +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 C488545DFD for ; Fri, 11 Aug 2023 09:34:39 +0200 (CEST) Date: Fri, 11 Aug 2023 09:34:38 +0200 From: Wolfgang Bumiller To: Stoiko Ivanov Cc: pbs-devel@lists.proxmox.com Message-ID: References: <20230809103426.24142-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230809103426.24142-1-s.ivanov@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.106 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pbs2to3.rs, rust-lang.org] Subject: [pbs-devel] applied: [PATCH proxmox-backup] pbs2to3: fix boot-mode detection 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, 11 Aug 2023 07:35:11 -0000 applied, thanks On Wed, Aug 09, 2023 at 10:34:26AM +0000, Stoiko Ivanov wrote: > /sys/firmware/efi is a directory and std::path::Path seems to detect > only regular files with is_file [0]. > > Reported in our Enterprise support portal. > > Quickly tested the fix on a VM. > > https://doc.rust-lang.org/stable/std/path/struct.Path.html#method.is_file > > Signed-off-by: Stoiko Ivanov > --- > technically only needed on master - since the check is not run before > the upgrade picked into stable-2 anyway for the sake of keeping them in sync for potential future patch conflicts > src/bin/pbs2to3.rs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/bin/pbs2to3.rs b/src/bin/pbs2to3.rs > index a052ae3a..9a18d7b2 100644 > --- a/src/bin/pbs2to3.rs > +++ b/src/bin/pbs2to3.rs > @@ -203,7 +203,7 @@ impl Checker { > return Ok(()); > } > > - if !Path::new("/sys/firmware/efi").is_file() { > + if !Path::new("/sys/firmware/efi").is_dir() { > self.output > .log_skip("System booted in legacy-mode - no need for systemd-boot")?; > return Ok(()); > -- > 2.39.2